diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-07-07 06:09:50 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-07-07 06:09:50 +0000 |
| commit | fe1ec8dd3f66dea3d90334bbd2604e7bbd0b9772 (patch) | |
| tree | 39061044d9aaffde07a5bfb28adaaf6ef6a7a1e7 /gtk | |
| parent | 4f8c1187cc5f8d4b31593872e1a90c8a60c8353c (diff) | |
With GLib 1.2[.x], undefine MUST_LAUNCH_BROWSER_OURSELVES, so that we
say that we don't need a preference for the command to launch a browser
(that preference won't make any difference).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11330 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/webbrowser.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gtk/webbrowser.c b/gtk/webbrowser.c index af809f1723..c15e4d3f04 100644 --- a/gtk/webbrowser.c +++ b/gtk/webbrowser.c @@ -55,6 +55,16 @@ #define MUST_LAUNCH_BROWSER_OURSELVES #endif +/* + * XXX - we use GLib 2.x routines to launch the browser ourselves, so we + * can't do it if we're using GLib 1.2[.x]. + */ +#ifdef MUST_LAUNCH_BROWSER_OURSELVES +#if (GLIB_MAJOR_VERSION < 2) +#undef MUST_LAUNCH_BROWSER_OURSELVES /* *can't* launch browser ourselves */ +#endif /* (GLIB_MAJOR_VERSION < 2) */ +#endif /* MUST_LAUNCH_BROWSER_OURSELVES */ + #ifdef MUST_LAUNCH_BROWSER_OURSELVES static gchar* strreplace (const gchar *string, const gchar *delimiter, @@ -103,8 +113,7 @@ browser_open_url (const gchar *url) CFRelease(url_CFString); return (status == 0); -#elif (GLIB_MAJOR_VERSION >= 2) - +#elif defined(MUST_LAUNCH_BROWSER_OURSELVES) GError *error = NULL; gchar *browser; |