move tap_dfilter_dlg.h from / to /gtk (and use the callback mechanism in main.c instead)

svn path=/trunk/; revision=24956

21 files changed, 22 insertions, 20 deletions

diff --git a/file.c b/file.c
index 8b73fa0729..33fb553c7c 100644
--- a/file.c
+++ b/file.c
@@ -71,7 +71,6 @@
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>
 #include "stat_menu.h"
-#include "tap_dfilter_dlg.h"
 #include <epan/dissectors/packet-data.h>
 #include <epan/dissectors/packet-ber.h>
 #include <epan/timestamp.h>
@@ -431,7 +430,6 @@ cf_read(capture_file *cf)
   cum_bytes=0;
 
   reset_tap_listeners();
-  tap_dfilter_dlg_update();
 
   cf_callback_invoke(cf_cb_file_read_start, cf);
 
diff --git a/gtk/afp_stat.c b/gtk/afp_stat.c
index e35d8fba89..f828112d43 100644
--- a/gtk/afp_stat.c
+++ b/gtk/afp_stat.c
@@ -51,7 +51,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 
 
 /* used to keep track of the statistics for an entire program interface */
diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c
index 65461e8f49..4d9fcb328d 100644
--- a/gtk/bootp_stat.c
+++ b/gtk/bootp_stat.c
@@ -40,7 +40,7 @@
 #include "../register.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 
 typedef const char* bootp_info_value_t;
 
diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c
index c1352965fe..683768581b 100644
--- a/gtk/expert_dlg.c
+++ b/gtk/expert_dlg.c
@@ -52,7 +52,7 @@
 #include "dlg_utils.h"
 #include "../stat_menu.h"
 #include "gui_stat_menu.h"
-#include <../tap_dfilter_dlg.h>
+#include "tap_dfilter_dlg.h"
 #include <epan/stat_cmd_args.h>
 
 #include <epan/prefs.h>
diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c
index 2087f5dbf8..d6cd2b441f 100644
--- a/gtk/fc_stat.c
+++ b/gtk/fc_stat.c
@@ -52,7 +52,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gtkglobals.h"
 
 
diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c
index 64d7e28e5b..b80e23b123 100644
--- a/gtk/funnel_stat.c
+++ b/gtk/funnel_stat.c
@@ -51,7 +51,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "font_utils.h"
 #include "gui_stat_menu.h"
 #include <epan/prefs.h>
diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c
index 2b27e6ea8b..9a8fe6dbb5 100644
--- a/gtk/h225_counter.c
+++ b/gtk/h225_counter.c
@@ -49,7 +49,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 
 
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c
index 5b0816ecab..a09a64346a 100644
--- a/gtk/h225_ras_srt.c
+++ b/gtk/h225_ras_srt.c
@@ -50,7 +50,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 
 
diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c
index 7e973a8336..c46f643964 100644
--- a/gtk/ldap_stat.c
+++ b/gtk/ldap_stat.c
@@ -50,7 +50,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gtkglobals.h"
 
 
diff --git a/gtk/main.c b/gtk/main.c
index 1133fa8177..c83c7a0234 100644
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -152,6 +152,8 @@
 #include "log.h"
 #include "../epan/emem.h"
 #include "file_util.h"
+#include "tap_dfilter_dlg.h"
+
 #ifdef HAVE_LIBPCAP
 #include "../image/wsicon16.xpm"
 #include "../image/wsicon32.xpm"
@@ -1366,6 +1368,8 @@ main_cf_cb_file_closed(capture_file *cf _U_)
 static void
 main_cf_cb_file_read_start(capture_file *cf _U_)
 {
+  tap_dfilter_dlg_update();
+
   /* Set up main window for a capture file. */
   main_set_for_capture_file(TRUE);
 }
diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c
index f76a5849f3..f0e0ec5a9d 100644
--- a/gtk/mgcp_stat.c
+++ b/gtk/mgcp_stat.c
@@ -49,7 +49,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 
 #define NUM_TIMESTATS 10
diff --git a/gtk/ncp_stat.c b/gtk/ncp_stat.c
index cf2d974f18..516a2766e3 100644
--- a/gtk/ncp_stat.c
+++ b/gtk/ncp_stat.c
@@ -50,7 +50,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gtkglobals.h"
 
 
diff --git a/gtk/radius_stat.c b/gtk/radius_stat.c
index 9dc8e189ee..c79d66a265 100644
--- a/gtk/radius_stat.c
+++ b/gtk/radius_stat.c
@@ -49,7 +49,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 
 
diff --git a/gtk/sctp_chunk_stat.c b/gtk/sctp_chunk_stat.c
index 5665876647..8545fdd864 100644
--- a/gtk/sctp_chunk_stat.c
+++ b/gtk/sctp_chunk_stat.c
@@ -49,7 +49,7 @@
 #include "../file.h"
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 
 
diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c
index dd7b92ea84..bea2172048 100644
--- a/gtk/sip_stat.c
+++ b/gtk/sip_stat.c
@@ -42,7 +42,7 @@
 #include <epan/dissectors/packet-sip.h>
 #include "../globals.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 
 #define SUM_STR_MAX	1024
 
diff --git a/gtk/smb2_stat.c b/gtk/smb2_stat.c
index 6d8857bdcb..7fd5d9b649 100644
--- a/gtk/smb2_stat.c
+++ b/gtk/smb2_stat.c
@@ -50,7 +50,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gtkglobals.h"
 
 
diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c
index 2ddee5cc50..bb0f29cea3 100644
--- a/gtk/smb_stat.c
+++ b/gtk/smb_stat.c
@@ -51,7 +51,7 @@
 #include "filter_dlg.h"
 #include "service_response_time_table.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gtkglobals.h"
 
 
diff --git a/gtk/stats_tree_stat.c b/gtk/stats_tree_stat.c
index 7ed728f993..e74749b4dd 100644
--- a/gtk/stats_tree_stat.c
+++ b/gtk/stats_tree_stat.c
@@ -39,7 +39,7 @@
 #include "gui_utils.h"
 #include "dlg_utils.h"
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 
 struct _st_node_pres {
 	GtkTreeIter*	iter;
diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c
index c8d6e096f7..32da8dd6e9 100644
--- a/gtk/tap_dfilter_dlg.c
+++ b/gtk/tap_dfilter_dlg.c
@@ -45,7 +45,7 @@
 #include <epan/stat_cmd_args.h>
 #include "../stat_menu.h"
 #include "gui_stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 #include "gui_utils.h"
 #include "gtkglobals.h"
 
diff --git a/tap_dfilter_dlg.h b/gtk/tap_dfilter_dlg.h
index 43fe396aad..43fe396aad 100644
--- a/tap_dfilter_dlg.h
+++ b/gtk/tap_dfilter_dlg.h
diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c
index 2a3ef53ee3..58dc49cb04 100644
--- a/gtk/wsp_stat.c
+++ b/gtk/wsp_stat.c
@@ -42,7 +42,7 @@
 #include "../globals.h"
 #include <epan/dissectors/packet-wsp.h>
 #include "../stat_menu.h"
-#include "../tap_dfilter_dlg.h"
+#include "tap_dfilter_dlg.h"
 
 /* used to keep track of the stats for a specific PDU type*/
 typedef struct _wsp_pdu_t {