"gtk_tap_dfilter_dlg_cb()" is no longer used outside

gtk/tap_dfilter_dlg.c; don't export it.

That means that gtk/tap_dfilter_dlg.h is no longer useful; get rid of
it.

Rename "gtk_tap_dfilter_dlg_cb()" to "tap_dfilter_dlg_cb()", as it's
inside GTK+-specific code, so there's no need to distinguish it from
non-GTK+ callbacks.

Update some comments to reflect the name change and the new API for
registering tap_dfilter_dlg stats.

Make the AFP and SMB stats use the gtk/tap_dfilter_dlg.c stuff.

svn path=/trunk/; revision=15496

1 files changed, 6 insertions, 4 deletions

diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index c0298f3999..604688361e 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -46,7 +46,6 @@
 #include "../stat_menu.h"
 #include "gtk_stat_menu.h"
 #include "../tap_dfilter_dlg.h"
-#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 #include "gtkglobals.h"
 
@@ -63,6 +62,9 @@ static tap_dfilter_dlg_list_item *start_dlg_list=NULL;
 static tap_dfilter_dlg_list_item *end_dlg_list=NULL;
 static tap_dfilter_dlg_list_item *current_dlg = NULL;
 
+static void
+tap_dfilter_dlg_cb(GtkWidget *w, gpointer data);
+
 /*
  * Register a stat that has a display filter dialog.
  * We register it both as a command-line stat and a menu item stat.
@@ -80,7 +82,7 @@ register_dfilter_stat(tap_dfilter_dlg *info, const char *name,
 	 * to it.
 	 */
 	full_name = g_strdup_printf("%s...", name);
-	register_stat_menu_item(full_name, group, gtk_tap_dfilter_dlg_cb, NULL,
+	register_stat_menu_item(full_name, group, tap_dfilter_dlg_cb, NULL,
 	    NULL, info);
 	g_free(full_name);
 }              
@@ -125,8 +127,8 @@ tap_dfilter_dlg_start_button_clicked(GtkWidget *item _U_, gpointer dialog_data)
 }
 
 
-void
-gtk_tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
+static void
+tap_dfilter_dlg_cb(GtkWidget *w _U_, gpointer data)
 {
 	const char *filter;
 	char *title;