diff options
| -rw-r--r-- | config.nmake | 15 | ||||
| -rw-r--r-- | gtk/help_dlg.c | 10 | ||||
| -rw-r--r-- | gtk/menu.c | 2 |
3 files changed, 7 insertions, 20 deletions
diff --git a/config.nmake b/config.nmake index 5dbfd5f874..16f96ce1fe 100644 --- a/config.nmake +++ b/config.nmake @@ -417,15 +417,6 @@ LOCAL_LDFLAGS=/DEBUG PLUGIN_LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS) -# -# Optional: Use the User's Guide as the online help system -# (currently experimental). -# -# If you don't have the User's Guide, comment this line out, so that -# ENABLE_WSUG isn't defined. -# -#ENABLE_WSUG=USE - # # According to http://bugs.wireshark.org/bugzilla/show_bug.cgi?id=403 # XCOPY under Windows NT doesn't support the "/Y" flag. This works @@ -775,11 +766,5 @@ LIBWIRESHARK_CONFIG=^#define HAVE_LIBWIRESHARKDLL 1 LIBWIRESHARK_CONFIG= !ENDIF -!IFDEF ENABLE_WSUG -WSUG_CFLAGS=-DENABLE_WSUG -!ELSE -WSUG_CFLAGS= -!ENDIF - # Construct the path PATH=$(PATH);$(CYGWIN_PATH);$(GLIB_DIR)\bin;$(GETTEXT_DIR)\bin;$(ICONV_DIR)\bin;$(ZLIB_PATH);$(ADNS_PATH) diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c index 4fb41d8a47..4d53f0df3c 100644 --- a/gtk/help_dlg.c +++ b/gtk/help_dlg.c @@ -194,8 +194,9 @@ void help_dialog(void) gboolean topic_available(topic_action_e action) { -#ifdef ENABLE_WSUG +#if (GLIB_MAJOR_VERSION >= 2) if(action == HELP_CAPTURE_INTERFACES_DETAILS_DIALOG) { + /* XXX - add the page HELP_CAPTURE_INTERFACES_DETAILS_DIALOG and remove this if */ /* page currently not existing in user's guide */ return FALSE; } @@ -225,6 +226,7 @@ gboolean topic_available(topic_action_e action) { #endif } + /* * Open the help dialog and show a specific HTML help page. */ @@ -264,6 +266,7 @@ static void help_topic_html(const gchar *topic) { } +#if (GLIB_MAJOR_VERSION >= 2) /* * Open the help dialog and show a specific GTK help page. */ @@ -296,6 +299,7 @@ static void help_topic_gtk(const gchar *topic) { /* topic page not found, default (first page) will be shown */ } +#endif /* @@ -388,7 +392,7 @@ topic_action(topic_action_e action) browser_open_data_file("text2pcap.html"); break; -#ifdef ENABLE_WSUG +#if (GLIB_MAJOR_VERSION >= 2) /* local help pages (User's Guide) */ case(HELP_CONTENT): help_topic_html( "index.html"); @@ -493,7 +497,7 @@ topic_action(topic_action_e action) case(HELP_DISPLAY_FILTERS_DIALOG): help_topic_gtk("Display Filters"); break; -#endif +#endif /* GLIB_MAJOR_VERSION */ default: g_assert_not_reached(); diff --git a/gtk/menu.c b/gtk/menu.c index 9d5ffb2d5f..176a56caf7 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -617,9 +617,7 @@ static GtkItemFactoryEntry menu_items[] = ITEM_FACTORY_STOCK_ENTRY("/Help/_Contents", "F1", topic_menu_cb, HELP_CONTENT, GTK_STOCK_HELP), ITEM_FACTORY_ENTRY("/Help/_Supported Protocols", NULL, supported_cb, 0, NULL, NULL), #if (GLIB_MAJOR_VERSION >= 2) -#ifdef ENABLE_WSUG ITEM_FACTORY_ENTRY("/Help/User's Guide", NULL, topic_menu_cb, HELP_CONTENT, NULL, NULL), -#endif ITEM_FACTORY_ENTRY("/Help/Manual Pages", NULL, NULL, 0, "<Branch>", NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK, NULL, NULL), ITEM_FACTORY_ENTRY("/Help/Manual Pages/Wireshark Filter", NULL, topic_menu_cb, LOCALPAGE_MAN_WIRESHARK_FILTER, NULL, NULL), |