diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2004-07-07 16:26:52 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2004-07-07 16:26:52 +0000 |
| commit | 355c9126ff7d43990e6ea411eb914f1ab18811a4 (patch) | |
| tree | 95ff2d64646e828bc33e3a72451d0475c40a7136 /gtk/menu.c | |
| parent | 7c73a1552b3d440ebafcfb7b68f33c8cb01426d0 (diff) | |
don't show webbrowser calling menu items, when using GLib 1.x
svn path=/trunk/; revision=11333
Diffstat (limited to 'gtk/menu.c')
| -rw-r--r-- | gtk/menu.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index afbb1b9960..2964519565 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.207 2004/06/25 17:33:33 ulfl Exp $ + * $Id: menu.c,v 1.208 2004/07/07 16:26:52 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -324,6 +324,8 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_ENTRY("/_Help", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", help_cb, 0, GTK_STOCK_HELP), ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL), +#if (GLIB_MAJOR_VERSION >= 2) + /* currently, glib1.x can't start a webbrowser, see webbrowser.c for details */ ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Ethereal Filter", NULL, url_localpage_cb, LOCALPAGE_MAN_ETHEREAL_FILTER, NULL, NULL), @@ -338,6 +340,7 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_ENTRY("/Help/Ethereal Online/FAQ's", NULL, url_onlinepage_cb, ONLINEPAGE_FAQ, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Downloads", NULL, url_onlinepage_cb, ONLINEPAGE_DOWNLOAD, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Ethereal Online/Example Files", NULL, url_onlinepage_cb, ONLINEPAGE_SAMPLE, NULL, NULL), +#endif ITEM_FACTORY_ENTRY("/Help/<separator>", NULL, NULL, 0, "<Separator>", NULL), ITEM_FACTORY_ENTRY("/Help/_About Ethereal", NULL, about_ethereal_cb, 0, NULL, NULL) |