Removed the usage of topic_available() as we now have all topics.

svn path=/trunk/; revision=25505

26 files changed, 103 insertions, 289 deletions

diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index c4ef737a66..60a77c9b47 100644
--- a/gtk/capture_dlg.c
+++ b/gtk/capture_dlg.c
@@ -1657,7 +1657,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_)
     "Perform transport layer name resolution while capturing.", NULL);
   gtk_container_add(GTK_CONTAINER(resolv_vb), t_resolv_cb);
 
-  /* Button row: "Start" and "Cancel" buttons */
+  /* Button row: "Start", "Cancel" and "Help" buttons */
   bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_START, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
diff --git a/gtk/capture_if_details_dlg_win32.c b/gtk/capture_if_details_dlg_win32.c
index 2a99784a1e..2600acb584 100644
--- a/gtk/capture_if_details_dlg_win32.c
+++ b/gtk/capture_if_details_dlg_win32.c
@@ -2349,20 +2349,14 @@ capture_if_details_open_win(char *iface)
     gtk_box_pack_start(GTK_BOX(main_vb), label, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
 
     /* Button row. */
-    if(topic_available(HELP_CAPTURE_INTERFACES_DETAILS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE /*expand*/, FALSE /*fill*/, 0 /*padding*/);
 
     close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
     window_set_cancel_button(details_open_w, close_bt, window_cancel_button_cb);
 
-    if(topic_available(HELP_CAPTURE_INTERFACES_DETAILS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer) (HELP_CAPTURE_INTERFACES_DETAILS_DIALOG));
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer) (HELP_CAPTURE_INTERFACES_DETAILS_DIALOG));
 
     gtk_widget_grab_focus(close_bt);
 
diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c
index 6666094d4f..9ba89c5c44 100644
--- a/gtk/capture_if_dlg.c
+++ b/gtk/capture_if_dlg.c
@@ -629,22 +629,16 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_)
 
   g_string_free(if_tool_str, TRUE);
 
-  /* Button row: close button */
-  if(topic_available(HELP_CAPTURE_INTERFACES_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-  }
+  /* Button row: close and help button */
+  bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
   close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(cap_if_w, close_bt, window_cancel_button_cb);
   gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
 
-  if(topic_available(HELP_CAPTURE_INTERFACES_DIALOG)) {
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)(HELP_CAPTURE_INTERFACES_DIALOG));
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)(HELP_CAPTURE_INTERFACES_DIALOG));
 
   gtk_widget_size_request(GTK_WIDGET(close_bt), &requisition);
   /* height + static offset + what GTK-Wimp needs in addition per interface */
diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c
index 6af39011c7..801e96fdb0 100644
--- a/gtk/capture_info_dlg.c
+++ b/gtk/capture_info_dlg.c
@@ -257,11 +257,7 @@ const gchar     *iface)
 
   /* allow user to either click a stop button, or the close button on
 	the window to stop a capture in progress. */
-  if(topic_available(HELP_CAPTURE_INFO_DIALOG)) {
-      bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_STOP, GTK_STOCK_HELP, NULL);
-  } else{
-      bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_STOP, NULL);
-  }
+  bbox = dlg_button_row_new(WIRESHARK_STOCK_CAPTURE_STOP, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 3);
   gtk_widget_show(bbox);
 
@@ -270,11 +266,9 @@ const gchar     *iface)
   g_signal_connect(stop_bt, "clicked", G_CALLBACK(capture_info_delete_cb), capture_opts);
   g_signal_connect(info->cap_w, "delete_event", G_CALLBACK(capture_info_delete_cb), capture_opts);
 
-  if(topic_available(HELP_CAPTURE_INFO_DIALOG)) {
-      ci_help = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      gtk_tooltips_set_tip (tooltips, ci_help, ("Get help about this dialog"), NULL);
-      g_signal_connect(ci_help, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CAPTURE_INFO_DIALOG);
-  }
+  ci_help = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  gtk_tooltips_set_tip (tooltips, ci_help, ("Get help about this dialog"), NULL);
+  g_signal_connect(ci_help, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_CAPTURE_INFO_DIALOG);
 
   gtk_widget_show(info->cap_w);
   window_present(info->cap_w);
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index 23804ec28d..0d500e182f 100644
--- a/gtk/color_dlg.c
+++ b/gtk/color_dlg.c
@@ -359,12 +359,8 @@ colorize_dialog_new (char *filter)
   gtk_widget_set_sensitive (color_filter_down, FALSE);
 
 
-  /* Button row: OK and cancel buttons */
-  if(topic_available(HELP_COLORING_RULES_DIALOG)) {
-    button_ok_hbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  } else {
-    button_ok_hbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-  }
+  /* Button row: OK, cancel and help buttons */
+  button_ok_hbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start (GTK_BOX (dlg_vbox), button_ok_hbox, FALSE, FALSE, 5);
 
   color_ok = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_OK);
@@ -380,11 +376,9 @@ colorize_dialog_new (char *filter)
   window_set_cancel_button(color_win, color_cancel, color_cancel_cb);
   gtk_tooltips_set_tip (tooltips, color_cancel, ("Cancel changes done (since last \"Apply\") and close this dialog"), NULL);
 
-  if(topic_available(HELP_COLORING_RULES_DIALOG)) {
-      color_help = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_HELP);
-      gtk_tooltips_set_tip (tooltips, color_help, ("Get help about this dialog"), NULL);
-      g_signal_connect(color_help, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_COLORING_RULES_DIALOG);
-  }
+  color_help = g_object_get_data(G_OBJECT(button_ok_hbox), GTK_STOCK_HELP);
+  gtk_tooltips_set_tip (tooltips, color_help, ("Get help about this dialog"), NULL);
+  g_signal_connect(color_help, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_COLORING_RULES_DIALOG);
 
   gtk_widget_grab_default(color_ok);
 
diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index a01af517d0..36b1bfb011 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -1341,12 +1341,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     /* Button row. */
     /* XXX - maybe we want to have a "Copy as CSV" stock button here? */
     /*copy_bt = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-    }
-
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
@@ -1358,10 +1353,8 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
     g_object_set_data(G_OBJECT(copy_bt), CONV_PTR_KEY, conversations);
     g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
 
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_CONVERSATIONS_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_CONVERSATIONS_DIALOG);
 
     g_signal_connect(conversations->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(conversations->win, "destroy", G_CALLBACK(ct_win_destroy_cb), conversations);
@@ -1587,11 +1580,7 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     /* Button row. */
     /* XXX - maybe we want to have a "Copy as CSV" stock button here? */
     /*copy_bt = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
@@ -1606,10 +1595,8 @@ init_conversation_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_switch_page_cb), copy_bt);
 
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_CONVERSATIONS_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_CONVERSATIONS_DIALOG);
 
     g_signal_connect(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(win, "destroy", G_CALLBACK(ct_win_destroy_notebook_cb), pages);
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index 1f97e546ba..791ba7baae 100644
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -574,11 +574,7 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_)
     }
 
     /* Button row */
-    if(topic_available(HELP_DECODE_AS_SHOW_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CLEAR, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CLEAR, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_CLEAR, GTK_STOCK_HELP, NULL);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
@@ -588,10 +584,8 @@ decode_show_cb (GtkWidget * w _U_, gpointer data _U_)
     clear_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLEAR);
     g_signal_connect(clear_bt, "clicked", G_CALLBACK(decode_show_clear_cb), decode_show_w);
 
-    if(topic_available(HELP_DECODE_AS_SHOW_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DECODE_AS_SHOW_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DECODE_AS_SHOW_DIALOG);
 
     /* set ok as default, this button won't change anything */
     window_set_cancel_button(decode_show_w, ok_bt, NULL);
@@ -1767,11 +1761,7 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_)
     }
 
     /* Button row */
-    if(topic_available(HELP_DECODE_AS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CLOSE, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
     gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
     gtk_widget_show(bbox);
 
@@ -1791,10 +1781,8 @@ decode_as_cb (GtkWidget * w _U_, gpointer data _U_)
     gtk_tooltips_set_tip(tooltips, close_bt, 
         "Close the dialog, don't redissect packets.", NULL);
 
-    if(topic_available(HELP_DECODE_AS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DECODE_AS_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_DECODE_AS_DIALOG);
 
     gtk_widget_grab_default(ok_bt);
 
diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c
index 973fd45a91..cd817cf6b6 100644
--- a/gtk/expert_comp_dlg.c
+++ b/gtk/expert_comp_dlg.c
@@ -267,21 +267,15 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_)
     }
 
     /* Button row. */
-    if(topic_available(HELP_EXPERT_INFO_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
     window_set_cancel_button(ss->win, close_bt, window_cancel_button_cb);
 
-    if(topic_available(HELP_EXPERT_INFO_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPERT_INFO_DIALOG);
-        gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPERT_INFO_DIALOG);
+    gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
 
     g_signal_connect(ss->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(ss->win, "destroy", G_CALLBACK(win_destroy_cb), ss);
diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index fa3e60c4de..b6e9bc3154 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -555,21 +555,15 @@ expert_dlg_init(const char *optarg, void* userdata _U_)
 	}
 
 	/* Button row. */
-	if(topic_available(HELP_EXPERT_INFO_DIALOG)) {
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-	} else {
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-	}
+	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
 	gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
 	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(etd->win, close_bt, window_cancel_button_cb);
 
-	if(topic_available(HELP_EXPERT_INFO_DIALOG)) {
-                help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-		g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPERT_INFO_DIALOG);
-		gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
-	}
+	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPERT_INFO_DIALOG);
+	gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
 
 	g_signal_connect(etd->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
 	g_signal_connect(etd->win, "destroy", G_CALLBACK(expert_dlg_destroy_cb), etd);
diff --git a/gtk/file_dlg_win32.c b/gtk/file_dlg_win32.c
index 7b129c5210..51a0b8f60c 100644
--- a/gtk/file_dlg_win32.c
+++ b/gtk/file_dlg_win32.c
@@ -177,10 +177,7 @@ win32_open_file (HWND h_wnd) {
     ofn->lpstrTitle = _T("Wireshark: Open Capture File");
     ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER |
 	    OFN_NOCHANGEDIR | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY |
-	    OFN_ENABLEHOOK;
-    if(topic_available(HELP_OPEN_WIN32_DIALOG)) {
-        ofn->Flags |= OFN_SHOWHELP;
-    }
+	    OFN_ENABLEHOOK | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;
     ofn->lpfnHook = open_file_hook_proc;
     ofn->lpTemplateName = _T("WIRESHARK_OPENFILENAME_TEMPLATE");
@@ -243,10 +240,7 @@ win32_save_as_file(HWND h_wnd, action_after_save_e action_after_save, gpointer a
     ofn->lpstrTitle = _T("Wireshark: Save file as");
     ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER |
 	    OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
-	    OFN_PATHMUSTEXIST | OFN_ENABLEHOOK;
-    if(topic_available(HELP_SAVE_WIN32_DIALOG)) {
-        ofn->Flags |= OFN_SHOWHELP;
-    }
+	    OFN_PATHMUSTEXIST | OFN_ENABLEHOOK | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;
     ofn->lpfnHook = save_as_file_hook_proc;
     ofn->lpTemplateName = _T("WIRESHARK_SAVEFILENAME_TEMPLATE");
@@ -359,10 +353,7 @@ win32_merge_file (HWND h_wnd) {
     ofn->lpstrTitle = _T("Wireshark: Merge with capture file");
     ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER |
 	    OFN_NOCHANGEDIR | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY |
-	    OFN_ENABLEHOOK;
-    if(topic_available(HELP_MERGE_WIN32_DIALOG)) {
-        ofn->Flags |= OFN_SHOWHELP;
-    }
+	    OFN_ENABLEHOOK | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;
     ofn->lpfnHook = merge_file_hook_proc;
     ofn->lpTemplateName = _T("WIRESHARK_MERGEFILENAME_TEMPLATE");
@@ -463,10 +454,7 @@ win32_export_file(HWND h_wnd, export_type_e export_type) {
     ofn->lpstrTitle = _T("Wireshark: Export File");
     ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER |
                  OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
-                 OFN_PATHMUSTEXIST | OFN_ENABLEHOOK;
-    if(topic_available(HELP_EXPORT_FILE_WIN32_DIALOG)) {
-        ofn->Flags |= OFN_SHOWHELP;
-    }
+                 OFN_PATHMUSTEXIST | OFN_ENABLEHOOK | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;
     ofn->lpfnHook = export_file_hook_proc;
     ofn->lpTemplateName = _T("WIRESHARK_EXPORTFILENAME_TEMPLATE");
@@ -572,10 +560,7 @@ win32_export_raw_file(HWND h_wnd) {
     ofn->lpstrTitle = _T("Wireshark: Export Raw Data");
     ofn->Flags = OFN_ENABLESIZING | OFN_ENABLETEMPLATE | OFN_EXPLORER |
                  OFN_NOCHANGEDIR | OFN_OVERWRITEPROMPT | OFN_HIDEREADONLY |
-                 OFN_PATHMUSTEXIST | OFN_ENABLEHOOK;
-    if(topic_available(HELP_EXPORT_BYTES_WIN32_DIALOG)) {
-        ofn->Flags |= OFN_SHOWHELP;
-    }
+                 OFN_PATHMUSTEXIST | OFN_ENABLEHOOK | OFN_SHOWHELP;
     ofn->lpstrDefExt = NULL;
     ofn->lCustData = cfile.finfo_selected->length;
     ofn->lpfnHook = export_raw_file_hook_proc;
diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c
index 872b270ff1..f7ab53254b 100644
--- a/gtk/fileset_dlg.c
+++ b/gtk/fileset_dlg.c
@@ -310,22 +310,16 @@ fileset_cb(GtkWidget *w _U_, gpointer d _U_)
 
   fileset_init_table(fs_tb_vb);
 
-  /* Button row: close button */
-  if(topic_available(HELP_FILESET_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-  }
+  /* Button row: close and help button */
+  bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 5);
 
   close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(fs_w, close_bt, window_cancel_button_cb);
   gtk_tooltips_set_tip(tooltips, close_bt, "Close this window.", NULL);
 
-  if(topic_available(HELP_FILESET_DIALOG)) {
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FILESET_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FILESET_DIALOG);
 
   gtk_widget_grab_default(close_bt);
 
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index fbe448ade1..950f8e03ae 100644
--- a/gtk/find_dlg.c
+++ b/gtk/find_dlg.c
@@ -312,11 +312,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
 
 
   /* Button row */
-  if(topic_available(HELP_FIND_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, NULL);
-  }
+  bbox = dlg_button_row_new(GTK_STOCK_FIND, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
@@ -326,10 +322,8 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
   g_signal_connect(cancel_bt, "clicked", G_CALLBACK(find_frame_close_cb), find_frame_w);
 
-  if(topic_available(HELP_FIND_DIALOG)) {
-      help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIND_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIND_DIALOG);
 
   /* Attach pointers to needed widgets to the capture prefs window/object */
   g_object_set_data(G_OBJECT(find_frame_w), E_FIND_FILT_KEY, filter_text_box);
diff --git a/gtk/firewall_dlg.c b/gtk/firewall_dlg.c
index fa21e7f729..edb10d6e80 100644
--- a/gtk/firewall_dlg.c
+++ b/gtk/firewall_dlg.c
@@ -285,11 +285,7 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
     rule_info->text = text;
 
     /* Button row */
-    if(topic_available(HELP_FIREWALL_DIALOG)) {
-        button_hbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_COPY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-    } else {
-        button_hbox = dlg_button_row_new(GTK_STOCK_COPY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-    }
+    button_hbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_COPY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
     gtk_box_pack_start(GTK_BOX(vbox), button_hbox, FALSE, FALSE, 0);
 
     /* Create Copy Button */
@@ -306,10 +302,8 @@ firewall_rule_cb(GtkWidget *w _U_, gpointer data _U_)
     gtk_tooltips_set_tip (tooltips, button, "Cancel the dialog", NULL);
     window_set_cancel_button(rule_w, button, window_cancel_button_cb);
 
-    if(topic_available(HELP_FIND_DIALOG)) {
-        button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_HELP);
-        g_signal_connect(button, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIREWALL_DIALOG);
-    }
+    button = g_object_get_data(G_OBJECT(button_hbox), GTK_STOCK_HELP);
+    g_signal_connect(button, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_FIREWALL_DIALOG);
 
     /* Tuck away the rule_info object into the window */
     g_object_set_data(G_OBJECT(rule_w), WS_RULE_INFO_KEY, rule_info);
diff --git a/gtk/follow_stream.c b/gtk/follow_stream.c
index e7eab0f407..458d41c541 100644
--- a/gtk/follow_stream.c
+++ b/gtk/follow_stream.c
@@ -822,15 +822,10 @@ follow_stream(gchar *title, follow_info_t *follow_info,
                        follow_info);
 	follow_info->raw_bt = radio_bt;
 
-	/* Button row: (help), filter out, close button */
-	if(topic_available(HELP_FILESET_DIALOG)) {
-		bbox = dlg_button_row_new(WIRESHARK_STOCK_FILTER_OUT_STREAM,
-					  GTK_STOCK_CLOSE, GTK_STOCK_HELP,
-					  NULL);
-	} else {
-		bbox = dlg_button_row_new(WIRESHARK_STOCK_FILTER_OUT_STREAM,
-					  GTK_STOCK_CLOSE, NULL);
-	}
+	/* Button row: help, filter out, close button */
+	bbox = dlg_button_row_new(WIRESHARK_STOCK_FILTER_OUT_STREAM,
+				  GTK_STOCK_CLOSE, GTK_STOCK_HELP,
+				  NULL);
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 5);
 
 
@@ -846,11 +841,9 @@ follow_stream(gchar *title, follow_info_t *follow_info,
 			      "Close the dialog and keep the current display filter", NULL);
 	gtk_widget_grab_default(button);
 
-	if(topic_available(HELP_FILESET_DIALOG)) {
-            button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-		g_signal_connect(button, "clicked", G_CALLBACK(topic_cb),
-			       (gpointer)HELP_FOLLOW_STREAM_DIALOG);
-	}
+	button = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	g_signal_connect(button, "clicked", G_CALLBACK(topic_cb),
+			 (gpointer)HELP_FOLLOW_STREAM_DIALOG);
 
 	/* Tuck away the follow_info object into the window */
 	g_object_set_data(G_OBJECT(streamwindow), E_FOLLOW_INFO_KEY, follow_info);
diff --git a/gtk/goto_dlg.c b/gtk/goto_dlg.c
index 56b5710575..a7f144a736 100644
--- a/gtk/goto_dlg.c
+++ b/gtk/goto_dlg.c
@@ -74,11 +74,7 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   gtk_widget_show(fnumber_te);
 
   /* Button row: OK and cancel buttons */
-  if(topic_available(HELP_GOTO_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_JUMP_TO, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_JUMP_TO, GTK_STOCK_CANCEL, NULL);
-  }
+  bbox = dlg_button_row_new(GTK_STOCK_JUMP_TO, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
   gtk_widget_show(bbox);
 
@@ -88,10 +84,8 @@ goto_frame_cb(GtkWidget *w _U_, gpointer d _U_)
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
   window_set_cancel_button(goto_frame_w, cancel_bt, window_cancel_button_cb);
 
-  if(topic_available(HELP_GOTO_DIALOG)) {
-      help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_GOTO_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_GOTO_DIALOG);
 
   gtk_widget_grab_default(ok_bt);
 
diff --git a/gtk/help_dlg.c b/gtk/help_dlg.c
index 5ffdb85dfd..94dd8435d1 100644
--- a/gtk/help_dlg.c
+++ b/gtk/help_dlg.c
@@ -77,14 +77,6 @@ typedef struct {
 static GSList *help_text_pages = NULL;
 
 
-
-gboolean topic_available(topic_action_e action _U_) {
-
-    /* online: we have all possible pages available */
-    return TRUE;
-}
-
-
 /*
  * Open the help dialog and show a specific HTML help page.
  */
diff --git a/gtk/help_dlg.h b/gtk/help_dlg.h
index 26dc404211..4ab2162554 100644
--- a/gtk/help_dlg.h
+++ b/gtk/help_dlg.h
@@ -112,13 +112,6 @@ void topic_cb(GtkWidget *widget, topic_action_e topic);
  */
 void topic_menu_cb(GtkWidget *widget _U_, gpointer data _U_, topic_action_e topic);
 
-/** Check, if a specific topic is available.
- *
- * @param action the topic action to display
- * @return TRUE, if topic is available, FALSE if not
- */
-gboolean topic_available(topic_action_e action);
-
 /** Redraw all the help dialog text widgets, to use a new font. */
 void help_redraw(void);
 
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 3894054cd0..7b3af77ef8 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -714,11 +714,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     /* Button row. */
     /* XXX - maybe we want to have a "Copy as CSV" stock button here? */
     /*copy_bt = gtk_button_new_with_label ("Copy content to clipboard as CSV");*/
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-    }
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
@@ -731,10 +727,8 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
     g_object_set_data(G_OBJECT(copy_bt), HOST_PTR_KEY, hosttable);
     g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), NULL);
 
-    if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
 
     g_signal_connect(hosttable->win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(hosttable->win, "destroy", G_CALLBACK(hostlist_win_destroy_cb), hosttable);
@@ -962,12 +956,7 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
     g_signal_connect(filter_cb, "toggled", G_CALLBACK(hostlist_filter_toggle_dest), pages);
 
     /* Button row. */
-    if(topic_available(HELP_STATS_CONVERSATIONS_DIALOG)) {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-    } else {
-        bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-    }
-
+    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
     gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
     close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
@@ -981,10 +970,8 @@ init_hostlist_notebook_cb(GtkWidget *w _U_, gpointer d _U_)
 
     g_signal_connect(nb, "switch-page", G_CALLBACK(ct_nb_switch_page_cb), copy_bt);
 
-    if(topic_available(HELP_STATS_ENDPOINTS_DIALOG)) {
-        help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-        g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
-    }
+    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_ENDPOINTS_DIALOG);
 
     g_signal_connect(win, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
     g_signal_connect(win, "destroy", G_CALLBACK(hostlist_win_destroy_notebook_cb), pages);
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index ce6701907c..0ceb2349c9 100644
--- a/gtk/io_stat.c
+++ b/gtk/io_stat.c
@@ -2086,22 +2086,13 @@ init_io_stat_window(io_stat_t *io)
 
 	io_stat_set_title(io);
 
-	if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) {
 #if GTK_CHECK_VERSION(2,6,0)
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE,
-					  GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
+	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE,
+				  GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 #else
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, 
-					  GTK_STOCK_HELP, NULL);
+	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, 
+				  GTK_STOCK_HELP, NULL);
 #endif
-	} else {
-#if GTK_CHECK_VERSION(2,6,0)
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_SAVE, 
-					  GTK_STOCK_COPY, NULL);
-#else
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-#endif
-	}
 	gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 	gtk_widget_show(bbox);
 
@@ -2122,11 +2113,9 @@ init_io_stat_window(io_stat_t *io)
 			     "Copy values from selected graphs to the clipboard in CSV (Comma Seperated Values) format", NULL);
 	g_signal_connect(copy_bt, "clicked", G_CALLBACK(copy_as_csv_cb), io);
 
-	if(topic_available(HELP_STATS_IO_GRAPH_DIALOG)) {
-                help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-		g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_IO_GRAPH_DIALOG);
-		gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
-	}
+	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_IO_GRAPH_DIALOG);
+	gtk_tooltips_set_tip (tooltips, help_bt, "Show topic specific help", NULL);
 
 	g_signal_connect(io->window, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
 
diff --git a/gtk/main_menu.c b/gtk/main_menu.c
index 7ca74cfa85..cb36cf9118 100644
--- a/gtk/main_menu.c
+++ b/gtk/main_menu.c
@@ -1959,8 +1959,8 @@ static void
 timestamp_precision_cb(GtkWidget *w _U_, gpointer d _U_, gint action)
 {
     if (recent.gui_time_precision != action) {
-		/* the actual precision will be set in cf_change_time_formats() below */
-        if(action == TS_PREC_AUTO) {
+        /* the actual precision will be set in cf_change_time_formats() below */
+        if (action == TS_PREC_AUTO) {
             timestamp_set_precision(TS_PREC_AUTO_SEC);
         } else {
             timestamp_set_precision(action);
diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c
index 8b79942de8..4993b1d6d8 100644
--- a/gtk/prefs_dlg.c
+++ b/gtk/prefs_dlg.c
@@ -598,12 +598,7 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
   prefs_modules_foreach_submodules(NULL, module_prefs_show, &cts);
 
   /* Button row: OK and alike buttons */
-
-  if(topic_available(HELP_PREFERENCES_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-  }
+  bbox = dlg_button_row_new(GTK_STOCK_HELP, GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
   gtk_box_pack_start(GTK_BOX(cts.main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
@@ -623,10 +618,8 @@ prefs_cb(GtkWidget *w _U_, gpointer dummy _U_)
 
   gtk_widget_grab_default(ok_bt);
 
-  if(topic_available(HELP_PREFERENCES_DIALOG)) {
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PREFERENCES_DIALOG);
 
   g_signal_connect(prefs_w, "delete_event", G_CALLBACK(prefs_main_delete_event_cb), prefs_w);
   g_signal_connect(prefs_w, "destroy", G_CALLBACK(prefs_main_destroy_cb), prefs_w);
diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c
index b50c27aadc..f289d005df 100644
--- a/gtk/print_dlg.c
+++ b/gtk/print_dlg.c
@@ -769,11 +769,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
 
 
   /* Button row */
-  if(topic_available(HELP_PRINT_DIALOG)) {
-    bbox = dlg_button_row_new(action == output_action_print ? GTK_STOCK_PRINT : GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(action == output_action_print ? GTK_STOCK_PRINT : GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
-  }
+  bbox = dlg_button_row_new(action == output_action_print ? GTK_STOCK_PRINT : GTK_STOCK_OK, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
@@ -808,21 +804,15 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args)
   gtk_tooltips_set_tip (tooltips, cancel_bt, "Cancel and exit dialog", NULL);
 
   if(action == output_action_print) {
-    if(topic_available(HELP_PRINT_DIALOG)) {
-        help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PRINT_DIALOG);
-    }
+    help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_PRINT_DIALOG);
   } else {
 #if _WIN32
-    if(topic_available(HELP_EXPORT_FILE_WIN32_DIALOG)) {
-        help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_WIN32_DIALOG);
-    }
+    help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_WIN32_DIALOG);
 #else
-    if(topic_available(HELP_EXPORT_FILE_DIALOG)) {
-        help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-      g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_DIALOG);
-    }
+    help_bt  = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_EXPORT_FILE_DIALOG);
 #endif
   }
 
diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index c7be15607b..c9de4fbaa7 100644
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -187,11 +187,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
 
 
   /* Button row */
-  if(topic_available(HELP_ENABLED_PROTOCOLS_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, NULL);
-  }
+  bbox = dlg_button_row_new(GTK_STOCK_OK, GTK_STOCK_APPLY, GTK_STOCK_SAVE, GTK_STOCK_CANCEL, GTK_STOCK_HELP, NULL);
   gtk_box_pack_start(GTK_BOX(main_vb), bbox, FALSE, FALSE, 0);
   gtk_widget_show(bbox);
 
@@ -208,10 +204,8 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_)
   cancel_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CANCEL);
   window_set_cancel_button(proto_w, cancel_bt, proto_cancel_cb);
 
-  if(topic_available(HELP_ENABLED_PROTOCOLS_DIALOG)) {
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_ENABLED_PROTOCOLS_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_ENABLED_PROTOCOLS_DIALOG);
 
   g_signal_connect(proto_w, "delete_event", G_CALLBACK(proto_delete_event_cb), NULL);
   g_signal_connect(proto_w, "destroy", G_CALLBACK(proto_destroy_cb), NULL);
diff --git a/gtk/proto_hier_stats_dlg.c b/gtk/proto_hier_stats_dlg.c
index 2285348622..96f2a758fa 100644
--- a/gtk/proto_hier_stats_dlg.c
+++ b/gtk/proto_hier_stats_dlg.c
@@ -398,21 +398,15 @@ proto_hier_stats_cb(GtkWidget *w _U_, gpointer d _U_)
 	ph_stats_free(ps);
 
 	/* Button row. */
-	if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-	} else {
-		bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-	}
+	bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
 	gtk_box_pack_end(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 	gtk_widget_show(bbox);
 
 	close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
 	window_set_cancel_button(dlg, close_bt, window_cancel_button_cb);
 
-	if(topic_available(HELP_STATS_PROTO_HIERARCHY_DIALOG)) {
-                help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-		g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_PROTO_HIERARCHY_DIALOG);
-	}
+	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_PROTO_HIERARCHY_DIALOG);
 
 	g_signal_connect(dlg, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
 
diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c
index d5496cf201..628ddf30bc 100644
--- a/gtk/summary_dlg.c
+++ b/gtk/summary_dlg.c
@@ -407,20 +407,14 @@ summary_open_cb(GtkWidget *w _U_, gpointer d _U_)
 
 
   /* Button row. */
-  if(topic_available(HELP_STATS_SUMMARY_DIALOG)) {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
-  } else {
-    bbox = dlg_button_row_new(GTK_STOCK_CLOSE, NULL);
-  }
+  bbox = dlg_button_row_new(GTK_STOCK_CLOSE, GTK_STOCK_HELP, NULL);
   gtk_container_add(GTK_CONTAINER(main_vb), bbox);
 
   close_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_CLOSE);
   window_set_cancel_button(sum_open_w, close_bt, window_cancel_button_cb);
 
-  if(topic_available(HELP_STATS_SUMMARY_DIALOG)) {
-    help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-    g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_SUMMARY_DIALOG);
-  }
+  help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+  g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_SUMMARY_DIALOG);
 
   gtk_widget_grab_focus(close_bt);
 
diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c
index 5f333ba4f8..4f4db9c499 100644
--- a/gtk/wlan_stat_dlg.c
+++ b/gtk/wlan_stat_dlg.c
@@ -1124,6 +1124,7 @@ wlanstat_dlg_create (void)
 
 	wlanstat_pane = gtk_vpaned_new();
 	gtk_box_pack_start (GTK_BOX (vbox), wlanstat_pane, TRUE, TRUE, 0);
+	gtk_paned_set_position(GTK_PANED(wlanstat_pane), recent.gui_geometry_wlan_stats_pane);
 	gtk_widget_show(wlanstat_pane);
 
 	/* init a scrolled window for overview */
@@ -1137,7 +1138,6 @@ wlanstat_dlg_create (void)
 	gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
 					    GTK_SHADOW_IN);
-	gtk_paned_set_position(GTK_PANED(wlanstat_pane), recent.gui_geometry_wlan_stats_pane);
 
 	store = gtk_list_store_new(NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, 
@@ -1171,6 +1171,7 @@ wlanstat_dlg_create (void)
 									  NULL);
 			gtk_tree_view_column_set_sort_column_id(column, i);
 		}
+
 		if (i != BSSID_COLUMN && i != SSID_COLUMN && i != PROTECTION_COLUMN) {
 			/* Align all number columns */
 			g_object_set(G_OBJECT(renderer), "xalign", 1.0, NULL);
@@ -1200,16 +1201,16 @@ wlanstat_dlg_create (void)
 	gtk_box_pack_start(GTK_BOX(selected_vb), scrolled_window, TRUE, TRUE, 0);
 	gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled_window),
 					    GTK_SHADOW_IN);
+
 	store = gtk_list_store_new(NUM_DETAIL_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
 				   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT,
 				   G_TYPE_INT, G_TYPE_INT, G_TYPE_INT, G_TYPE_STRING,
 				   G_TYPE_FLOAT, G_TYPE_POINTER);
 	hs->details = GTK_TREE_VIEW(tree_view_new(GTK_TREE_MODEL(store)));
-	gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->details));
+	gtk_container_add(GTK_CONTAINER (scrolled_window), GTK_WIDGET(hs->details));
 	g_object_unref(G_OBJECT(store));
 
 	tree_view = hs->details;
-
 	gtk_tree_view_set_headers_visible(tree_view, TRUE);
 	gtk_tree_view_set_headers_clickable(tree_view, TRUE);
 
@@ -1289,11 +1290,7 @@ wlanstat_dlg_create (void)
 	g_signal_connect(existing_cb, "toggled", G_CALLBACK(wlan_existing_toggle_dest), hs);
 
 	/* Button row. */
-	if (topic_available (HELP_STATS_WLAN_TRAFFIC_DIALOG)) {
-		bbox = dlg_button_row_new (GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
-	} else {
-		bbox = dlg_button_row_new (GTK_STOCK_CLOSE, GTK_STOCK_COPY, NULL);
-	}
+	bbox = dlg_button_row_new (GTK_STOCK_CLOSE, GTK_STOCK_COPY, GTK_STOCK_HELP, NULL);
 
 	gtk_box_pack_end (GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
 
@@ -1306,10 +1303,8 @@ wlanstat_dlg_create (void)
 			     "Copy all statistical values of this page to the clipboard in CSV (Comma Seperated Values) format.", NULL);
 	g_signal_connect(copy_bt, "clicked", G_CALLBACK(wlan_copy_as_csv), hs->table);
 
-	if (topic_available (HELP_STATS_WLAN_TRAFFIC_DIALOG)) {
-                help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
-		g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_WLAN_TRAFFIC_DIALOG);
-	}
+	help_bt = g_object_get_data(G_OBJECT(bbox), GTK_STOCK_HELP);
+	g_signal_connect(help_bt, "clicked", G_CALLBACK(topic_cb), (gpointer)HELP_STATS_WLAN_TRAFFIC_DIALOG);
 
 	g_signal_connect (wlanstat_dlg_w, "delete_event", G_CALLBACK(window_delete_event_cb), NULL);
 	g_signal_connect (wlanstat_dlg_w, "destroy", G_CALLBACK(win_destroy_cb), hs);