diff options
-rw-r--r-- | gtk/dcerpc_stat.c | 5 | ||||
-rw-r--r-- | gtk/endpoint_talkers_table.c | 4 | ||||
-rw-r--r-- | gtk/fc_stat.c | 4 | ||||
-rw-r--r-- | gtk/gtkglobals.h | 5 | ||||
-rw-r--r-- | gtk/h225_counter.c | 4 | ||||
-rw-r--r-- | gtk/h225_ras_srt.c | 4 | ||||
-rw-r--r-- | gtk/hostlist_table.c | 4 | ||||
-rw-r--r-- | gtk/ldap_stat.c | 4 | ||||
-rw-r--r-- | gtk/mgcp_stat.c | 4 | ||||
-rw-r--r-- | gtk/rpc_stat.c | 4 | ||||
-rw-r--r-- | gtk/rtp_stream_dlg.c | 5 | ||||
-rw-r--r-- | gtk/service_response_time_table.c | 5 | ||||
-rw-r--r-- | gtk/smb_stat.c | 4 | ||||
-rw-r--r-- | gtk/tap_dfilter_dlg.c | 4 |
14 files changed, 26 insertions, 34 deletions
diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index c5f4688e7f..918ea20a13 100644 --- a/gtk/dcerpc_stat.c +++ b/gtk/dcerpc_stat.c @@ -1,7 +1,7 @@ /* dcerpc_stat.c * dcerpc_stat 2002 Ronnie Sahlberg * - * $Id: dcerpc_stat.c,v 1.57 2004/05/27 19:59:48 ulfl Exp $ + * $Id: dcerpc_stat.c,v 1.58 2004/06/02 07:12:09 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,10 +51,9 @@ #include "filter_prefs.h" #include "compat_macros.h" #include "service_response_time_table.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; - /* used to keep track of the statistics for an entire program interface */ typedef struct _rpcstat_t { GtkWidget *win; diff --git a/gtk/endpoint_talkers_table.c b/gtk/endpoint_talkers_table.c index 88939989ac..8754954e9f 100644 --- a/gtk/endpoint_talkers_table.c +++ b/gtk/endpoint_talkers_table.c @@ -4,7 +4,7 @@ * endpoint_talkers_table 2003 Ronnie Sahlberg * Helper routines common to all endpoint talkers tap. * - * $Id: endpoint_talkers_table.c,v 1.43 2004/06/01 21:29:50 guy Exp $ + * $Id: endpoint_talkers_table.c,v 1.44 2004/06/02 07:12:09 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,8 +54,6 @@ #include "ui_util.h" #include "dlg_utils.h" -extern GtkWidget *main_display_filter_widget; - #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index 40843acd5e..f27476ea7c 100644 --- a/gtk/fc_stat.c +++ b/gtk/fc_stat.c @@ -1,7 +1,7 @@ /* fc_stat.c * fc_stat 2003 Ronnie Sahlberg * - * $Id: fc_stat.c,v 1.33 2004/05/27 19:59:49 ulfl Exp $ + * $Id: fc_stat.c,v 1.34 2004/06/02 07:12:09 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,8 +51,8 @@ #include "../globals.h" #include "filter_prefs.h" #include "service_response_time_table.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; /* used to keep track of the statistics for an entire program interface */ typedef struct _fcstat_t { diff --git a/gtk/gtkglobals.h b/gtk/gtkglobals.h index f87284a711..9e1df4ddf7 100644 --- a/gtk/gtkglobals.h +++ b/gtk/gtkglobals.h @@ -1,7 +1,7 @@ /* gtkglobals.h * GTK-related Global defines, etc. * - * $Id: gtkglobals.h,v 1.25 2004/06/01 17:33:36 ulfl Exp $ + * $Id: gtkglobals.h,v 1.26 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,6 +41,9 @@ extern GtkWidget *tree_view; /** byte notebook (packet bytes) pane */ extern GtkWidget *byte_nb_ptr; +/** the filter text entry in the filter toolbar */ +extern GtkWidget *main_display_filter_widget; + #if GTK_MAJOR_VERSION < 2 /** normal font */ extern GdkFont *m_r_font; diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index 4ccff47c19..307f9f9a70 100644 --- a/gtk/h225_counter.c +++ b/gtk/h225_counter.c @@ -2,7 +2,7 @@ * h225 message counter for ethereal * Copyright 2003 Lars Roland * - * $Id: h225_counter.c,v 1.21 2004/05/27 19:59:49 ulfl Exp $ + * $Id: h225_counter.c,v 1.22 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -54,8 +54,6 @@ #include "ui_util.h" -extern GtkWidget *main_display_filter_widget; - static void gtk_h225counter_init(char *optarg); static tap_dfilter_dlg h225_counter_dlg = { diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 1285b0e99e..3344d67a06 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -2,7 +2,7 @@ * h225 RAS Service Response Time statistics for ethereal * Copyright 2003 Lars Roland * - * $Id: h225_ras_srt.c,v 1.18 2004/05/27 19:59:49 ulfl Exp $ + * $Id: h225_ras_srt.c,v 1.19 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,8 +55,6 @@ #include "ui_util.h" -extern GtkWidget *main_display_filter_widget; - static void gtk_h225rassrt_init(char *optarg); static tap_dfilter_dlg h225_rassrt_dlg = { diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c index 9ed05534ad..13af4ace3f 100644 --- a/gtk/hostlist_table.c +++ b/gtk/hostlist_table.c @@ -2,7 +2,7 @@ * modified from endpoint_talkers_table.c 2003 Ronnie Sahlberg * Helper routines common to all host list taps. * - * $Id: hostlist_table.c,v 1.15 2004/06/01 23:00:24 guy Exp $ + * $Id: hostlist_table.c,v 1.16 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -50,8 +50,6 @@ #include "ui_util.h" #include "dlg_utils.h" -extern GtkWidget *main_display_filter_widget; - #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index 73db9e1d8e..b4a1ddc44e 100644 --- a/gtk/ldap_stat.c +++ b/gtk/ldap_stat.c @@ -1,7 +1,7 @@ /* ldap_stat.c * ldap_stat 2003 Ronnie Sahlberg * - * $Id: ldap_stat.c,v 1.21 2004/05/27 19:59:49 ulfl Exp $ + * $Id: ldap_stat.c,v 1.22 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,8 +51,8 @@ #include "../globals.h" #include "filter_prefs.h" #include "service_response_time_table.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; /* used to keep track of the statistics for an entire program interface */ typedef struct _ldapstat_t { diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index 7d97f796d9..e84427b15e 100644 --- a/gtk/mgcp_stat.c +++ b/gtk/mgcp_stat.c @@ -2,7 +2,7 @@ * mgcp-statistics for ethereal * Copyright 2003 Lars Roland * - * $Id: mgcp_stat.c,v 1.36 2004/05/27 19:59:49 ulfl Exp $ + * $Id: mgcp_stat.c,v 1.37 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,8 +55,6 @@ #include "ui_util.h" -extern GtkWidget *main_display_filter_widget; - #define NUM_TIMESTATS 10 /* used to keep track of the statistics for an entire program interface */ diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index 92f4de9208..1c1a5b08cb 100644 --- a/gtk/rpc_stat.c +++ b/gtk/rpc_stat.c @@ -1,7 +1,7 @@ /* rpc_stat.c * rpc_stat 2002 Ronnie Sahlberg * - * $Id: rpc_stat.c,v 1.47 2004/05/27 19:59:50 ulfl Exp $ + * $Id: rpc_stat.c,v 1.48 2004/06/02 07:12:10 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -48,8 +48,8 @@ #include "filter_prefs.h" #include "compat_macros.h" #include "service_response_time_table.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; /* used to keep track of the statistics for an entire program interface */ typedef struct _rpcstat_t { diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 21f309c8c4..5212078d5a 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -1,7 +1,7 @@ /* rtp_stream_dlg.c * RTP streams summary addition for ethereal * - * $Id: rtp_stream_dlg.c,v 1.24 2004/06/02 07:01:04 guy Exp $ + * $Id: rtp_stream_dlg.c,v 1.25 2004/06/02 07:12:10 ulfl Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -39,8 +39,8 @@ #include "tap_menu.h" #include "dlg_utils.h" #include "ui_util.h" -#include "main.h" #include "compat_macros.h" +#include "gtkglobals.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" @@ -49,7 +49,6 @@ #include <string.h> -extern GtkWidget *main_display_filter_widget; typedef const guint8 * ip_addr_p; diff --git a/gtk/service_response_time_table.c b/gtk/service_response_time_table.c index 06d6a5b5bd..8e1da8ceb0 100644 --- a/gtk/service_response_time_table.c +++ b/gtk/service_response_time_table.c @@ -3,7 +3,7 @@ * Helper routines common to all service response time statistics * tap. * - * $Id: service_response_time_table.c,v 1.18 2004/05/07 12:15:24 ulfl Exp $ + * $Id: service_response_time_table.c,v 1.19 2004/06/02 07:12:11 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -45,8 +45,9 @@ #include "gtk/color_dlg.h" #include "main.h" #include "ui_util.h" +#include "gtkglobals.h" + -extern GtkWidget *main_display_filter_widget; #define GTK_MENU_FUNC(a) ((GtkItemFactoryCallback)(a)) diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index f9395b9081..06ddd5d426 100644 --- a/gtk/smb_stat.c +++ b/gtk/smb_stat.c @@ -1,7 +1,7 @@ /* smb_stat.c * smb_stat 2003 Ronnie Sahlberg * - * $Id: smb_stat.c,v 1.44 2004/05/27 19:59:50 ulfl Exp $ + * $Id: smb_stat.c,v 1.45 2004/06/02 07:12:11 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -51,8 +51,8 @@ #include "../globals.h" #include "filter_prefs.h" #include "service_response_time_table.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; /* used to keep track of the statistics for an entire program interface */ typedef struct _smbstat_t { diff --git a/gtk/tap_dfilter_dlg.c b/gtk/tap_dfilter_dlg.c index 47f6156c6e..06f770b8f5 100644 --- a/gtk/tap_dfilter_dlg.c +++ b/gtk/tap_dfilter_dlg.c @@ -2,7 +2,7 @@ * Routines for display filter dialog used by gui taps * Copyright 2003 Lars Roland * - * $Id: tap_dfilter_dlg.c,v 1.9 2004/05/27 19:59:50 ulfl Exp $ + * $Id: tap_dfilter_dlg.c,v 1.10 2004/06/02 07:12:11 ulfl Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -45,8 +45,8 @@ #include "../tap_dfilter_dlg.h" #include "tap_dfilter_dlg.h" #include "ui_util.h" +#include "gtkglobals.h" -extern GtkWidget *main_display_filter_widget; typedef struct _tap_dfilter_dlg_list_item { GtkWidget *dlg; |