renamed filter_prefs to filter_dlg, as the filter settings are (well, for a long time) no longer part of the preferences dialog.

svn path=/trunk/; revision=11436

gtk/Makefile.common

@@ -46,7 +46,7 @@ ETHEREAL_GTK_SRC = \
 	endpoint_talkers_table.c	\
 	ethereal-tap-register.c	\
 	file_dlg.c	\
-	filter_prefs.c	\
+	filter_dlg.c	\
 	find_dlg.c	\
 	follow_dlg.c	\
 	font_utils.c	\

gtk/ansi_a_stat.c

@@ -50,7 +50,7 @@
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-ansi_a.h>
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include "ui_util.h"
 

gtk/ansi_map_stat.c

@@ -48,7 +48,7 @@
 #include "tap.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include <epan/dissectors/packet-ansi_map.h>
 #include "ui_util.h"

gtk/capture_dlg.c

@@ -39,7 +39,7 @@
 #include "main.h"
 #include "ui_util.h"
 #include "capture_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "pcap-util.h"

gtk/color_dlg.c

@@ -44,7 +44,7 @@
 #include "ui_util.h"
 #include "dfilter_expr_dlg.h"
 #include "compat_macros.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "file_dlg.h"
 #include "gtkglobals.h"
 #include "prefs.h"

gtk/dcerpc_stat.c

@@ -48,7 +48,7 @@
 #include "../register.h"
 #include <epan/dissectors/packet-dcerpc.h>
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"

gtk/dfilter_expr_dlg.c

@@ -53,7 +53,7 @@
 #include "simple_dialog.h"
 #include "dlg_utils.h"
 #include "proto_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "dfilter_expr_dlg.h"
 #include "compat_macros.h"
 

gtk/fc_stat.c

@@ -49,7 +49,7 @@
 #include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 

gtk/file_dlg.c

@@ -37,7 +37,7 @@
 #include "gtkglobals.h"
 #include <epan/resolv.h>
 #include "keys.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "ui_util.h"
 #include "alert_box.h"
 #include "simple_dialog.h"

gtk/filter_dlg.c

@@ -1,7 +1,5 @@
-/* filter_prefs.c
- * Dialog boxes for filter editing
- * (This used to be a notebook page under "Preferences", hence the
- * "prefs" in the file name.)
+/* filter_dlg.c
+ * Dialog boxes for (display and capture) filter editing
  *
  * $Id$
  *
@@ -36,7 +34,7 @@
 
 #include "filters.h"
 #include "gtk/main.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "dlg_utils.h"
 #include "ui_util.h"
 #include "simple_dialog.h"

gtk/find_dlg.c

@@ -37,7 +37,7 @@
 
 #include "ui_util.h"
 #include "find_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "alert_box.h"
 #include "simple_dialog.h"
 #include "dlg_utils.h"

gtk/gsm_a_stat.c

@@ -50,7 +50,7 @@
 #include <epan/dissectors/packet-bssap.h>
 #include <epan/dissectors/packet-gsm_a.h>
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include "ui_util.h"
 

gtk/gsm_map_stat.c

@@ -49,7 +49,7 @@
 #include "tap.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 
 #include <epan/dissectors/packet-gsm_map.h>

gtk/io_stat.c

@@ -51,10 +51,7 @@
 #include "../color.h"
 #include "compat_macros.h"
 #include "dlg_utils.h"
-
-/* filter prefs dialog */
-#include "filter_prefs.h"
-/* filter prefs dialog */
+#include "filter_dlg.h"
 
 void protect_thread_critical_region(void);
 void unprotect_thread_critical_region(void);

gtk/isup_stat.c

@@ -48,7 +48,7 @@
 #include "tap.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include <epan/dissectors/packet-isup.h>
 #include "ui_util.h"

gtk/ldap_stat.c

@@ -49,7 +49,7 @@
 #include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 

gtk/main.c

@@ -86,7 +86,7 @@
 #include "filters.h"
 #include "disabled_protos.h"
 #include "prefs.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "layout_prefs.h"
 #include "color.h"
 #include "color_filters.h"

gtk/menu.c

@@ -39,7 +39,7 @@
 #include "about_dlg.h"
 #include "capture_dlg.h"
 #include "color_dlg.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "dlg_utils.h"
 #include "file_dlg.h"
 #include "find_dlg.h"

gtk/mtp3_stat.c

@@ -48,7 +48,7 @@
 #include "tap.h"
 #include "../register.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include "ui_util.h"
 

gtk/rpc_stat.c

@@ -45,7 +45,7 @@
 #include "../register.h"
 #include <epan/dissectors/packet-rpc.h>
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "compat_macros.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"

gtk/smb_stat.c

@@ -49,7 +49,7 @@
 #include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "gtkglobals.h"
 

gtk/tap_dfilter_dlg.c

@@ -41,7 +41,7 @@
 #include "dlg_utils.h"
 #include "../file.h"
 #include "../globals.h"
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "../tap_dfilter_dlg.h"
 #include "tap_dfilter_dlg.h"
 #include "ui_util.h"

gtk/toolbar.c

@@ -46,7 +46,7 @@
 #ifdef HAVE_LIBPCAP
 #include "capture_dlg.h"
 #endif /* HAVE_LIBPCAP */
-#include "filter_prefs.h"
+#include "filter_dlg.h"
 #include "file_dlg.h"
 #include "find_dlg.h"
 #include "goto_dlg.h"