diff options
| author | Ulf Lamping <ulf.lamping@web.de> | 2007-01-16 04:08:35 +0000 |
|---|---|---|
| committer | Ulf Lamping <ulf.lamping@web.de> | 2007-01-16 04:08:35 +0000 |
| commit | 2d760bf075e54cf148d0bc145d20ac994c887791 (patch) | |
| tree | f42fbb0a9ac778b3d12ff4d8de4c43d3250fdd69 /gtk/help_dlg.c | |
| parent | c923fc15770c878c83ea743a7277eff6e44d2fe3 (diff) | |
in effect use the User's Guide as the online help system now (for GTK > V1)!
remove ENABLE_WSUG setting from config.nmake and replace it with GLIB_MAJOR_VERSION >= 2 (as Glib 1.x cannot open a browser to show a HTML file - it's just currently? not implemented)
svn path=/trunk/; revision=20446
Diffstat (limited to 'gtk/help_dlg.c')
| -rw-r--r-- | gtk/help_dlg.c | 10 |
1 files changed, 7 insertions, 3 deletions
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(); |