aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gtk/Makefile.common2
-rw-r--r--gtk/ansi_a_stat.c2
-rw-r--r--gtk/ansi_map_stat.c2
-rw-r--r--gtk/capture_dlg.c2
-rw-r--r--gtk/color_dlg.c2
-rw-r--r--gtk/dcerpc_stat.c2
-rw-r--r--gtk/dfilter_expr_dlg.c2
-rw-r--r--gtk/fc_stat.c2
-rw-r--r--gtk/file_dlg.c2
-rw-r--r--gtk/filter_dlg.c (renamed from gtk/filter_prefs.c)8
-rw-r--r--gtk/filter_dlg.h (renamed from gtk/filter_prefs.h)0
-rw-r--r--gtk/find_dlg.c2
-rw-r--r--gtk/gsm_a_stat.c2
-rw-r--r--gtk/gsm_map_stat.c2
-rw-r--r--gtk/io_stat.c5
-rw-r--r--gtk/isup_stat.c2
-rw-r--r--gtk/ldap_stat.c2
-rw-r--r--gtk/main.c2
-rw-r--r--gtk/menu.c2
-rw-r--r--gtk/mtp3_stat.c2
-rw-r--r--gtk/rpc_stat.c2
-rw-r--r--gtk/smb_stat.c2
-rw-r--r--gtk/tap_dfilter_dlg.c2
-rw-r--r--gtk/toolbar.c2
24 files changed, 25 insertions, 30 deletions
diff --git a/gtk/Makefile.common b/gtk/Makefile.common
index 58d776b670..9959f3d358 100644
--- a/gtk/Makefile.common
+++ b/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 \
diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c
index 439a7b871a..d28f5e2272 100644
--- a/gtk/ansi_a_stat.c
+++ b/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"
diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c
index f93dac2232..43e852894f 100644
--- a/gtk/ansi_map_stat.c
+++ b/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"
diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c
index a3f088cbb3..34f4e673d8 100644
--- a/gtk/capture_dlg.c
+++ b/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"
diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c
index ea94f62dc8..8f29b7dbba 100644
--- a/gtk/color_dlg.c
+++ b/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"
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c
index a8a90d4399..729d0287e5 100644
--- a/gtk/dcerpc_stat.c
+++ b/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"
diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c
index 1fbae8d561..f7c9eaa941 100644
--- a/gtk/dfilter_expr_dlg.c
+++ b/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"
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index c310d302cf..edc06c706a 100644
--- a/gtk/fc_stat.c
+++ b/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"
diff --git a/gtk/file_dlg.c b/gtk/file_dlg.c
index e70de62299..8e59e5978c 100644
--- a/gtk/file_dlg.c
+++ b/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"
diff --git a/gtk/filter_prefs.c b/gtk/filter_dlg.c
index c33c387a1c..47d408411d 100644
--- a/gtk/filter_prefs.c
+++ b/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"
diff --git a/gtk/filter_prefs.h b/gtk/filter_dlg.h
index 8459337329..8459337329 100644
--- a/gtk/filter_prefs.h
+++ b/gtk/filter_dlg.h
diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c
index 76c5b1e8fe..b12ec75ee8 100644
--- a/gtk/find_dlg.c
+++ b/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"
diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c
index fb06e4acf3..e02da74d73 100644
--- a/gtk/gsm_a_stat.c
+++ b/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"
diff --git a/gtk/gsm_map_stat.c b/gtk/gsm_map_stat.c
index 4d69da729a..d68083622d 100644
--- a/gtk/gsm_map_stat.c
+++ b/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>
diff --git a/gtk/io_stat.c b/gtk/io_stat.c
index 912a89dd7d..2fd57c0024 100644
--- a/gtk/io_stat.c
+++ b/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);
diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c
index 61222d4ab4..37f8a26805 100644
--- a/gtk/isup_stat.c
+++ b/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"
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 189ab46f7a..e5f4621404 100644
--- a/gtk/ldap_stat.c
+++ b/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"
diff --git a/gtk/main.c b/gtk/main.c
index ab88812f5a..e46737fddb 100644
--- a/gtk/main.c
+++ b/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"
diff --git a/gtk/menu.c b/gtk/menu.c
index 7f49b475b0..bf911a8f19 100644
--- a/gtk/menu.c
+++ b/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"
diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c
index 84cfb063d1..f2596346bf 100644
--- a/gtk/mtp3_stat.c
+++ b/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"
diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c
index 6ff5750fe2..bf64e48939 100644
--- a/gtk/rpc_stat.c
+++ b/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"
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 2463b0152e..f193494f91 100644
--- a/gtk/smb_stat.c
+++ b/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"
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index 61ad674808..9cf5671eba 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/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"
diff --git a/gtk/toolbar.c b/gtk/toolbar.c
index 81e8b62bf0..a0fd272383 100644
--- a/gtk/toolbar.c
+++ b/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"