diff options
-rw-r--r-- | gtk/Makefile.am | 3 | ||||
-rw-r--r-- | gtk/ansi_a_stat.c | 4 | ||||
-rw-r--r-- | gtk/ansi_map_stat.c | 4 | ||||
-rw-r--r-- | gtk/bootp_stat.c | 4 | ||||
-rw-r--r-- | gtk/dcerpc_stat.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_eth.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_fc.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_fddi.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_ip.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_ipx.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_tcpip.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_tr.c | 4 | ||||
-rw-r--r-- | gtk/endpoint_talkers_udpip.c | 4 | ||||
-rw-r--r-- | gtk/fc_stat.c | 4 | ||||
-rw-r--r-- | gtk/gsm_a_stat.c | 4 | ||||
-rw-r--r-- | gtk/h225_counter.c | 4 | ||||
-rw-r--r-- | gtk/h225_ras_srt.c | 4 | ||||
-rw-r--r-- | gtk/http_stat.c | 4 | ||||
-rw-r--r-- | gtk/io_stat.c | 4 | ||||
-rw-r--r-- | gtk/isup_stat.c | 4 | ||||
-rw-r--r-- | gtk/ldap_stat.c | 4 | ||||
-rw-r--r-- | gtk/menu.c | 3 | ||||
-rw-r--r-- | gtk/menu.h | 30 | ||||
-rw-r--r-- | gtk/mgcp_stat.c | 4 | ||||
-rw-r--r-- | gtk/rpc_progs.c | 4 | ||||
-rw-r--r-- | gtk/rpc_stat.c | 4 | ||||
-rw-r--r-- | gtk/rtp_analysis.c | 4 | ||||
-rw-r--r-- | gtk/rtp_stream_dlg.c | 4 | ||||
-rw-r--r-- | gtk/smb_stat.c | 4 | ||||
-rw-r--r-- | gtk/tap_menu.h | 63 | ||||
-rw-r--r-- | gtk/wsp_stat.c | 4 |
31 files changed, 122 insertions, 85 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e32df807c0..20337dcb76 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for the GTK interface routines for Ethereal # -# $Id: Makefile.am,v 1.89 2004/01/22 20:31:44 guy Exp $ +# $Id: Makefile.am,v 1.90 2004/02/11 04:17:02 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -76,6 +76,7 @@ noinst_HEADERS = \ summary_dlg.h \ supported_protos_dlg.h \ tap_dfilter_dlg.h \ + tap_menu.h \ tcp_graph.h \ toolbar.h \ ui_util.h diff --git a/gtk/ansi_a_stat.c b/gtk/ansi_a_stat.c index b1993f6516..6e45b10668 100644 --- a/gtk/ansi_a_stat.c +++ b/gtk/ansi_a_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_a_stat.c,v 1.11 2004/02/06 19:19:09 ulfl Exp $ + * $Id: ansi_a_stat.c,v 1.12 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "menu.h" +#include "tap_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "simple_dialog.h" diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index bababd4eee..b82205f61b 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: ansi_map_stat.c,v 1.14 2004/02/06 19:19:09 ulfl Exp $ + * $Id: ansi_map_stat.c,v 1.15 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "menu.h" +#include "tap_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "simple_dialog.h" diff --git a/gtk/bootp_stat.c b/gtk/bootp_stat.c index 97bb778c91..5f555db093 100644 --- a/gtk/bootp_stat.c +++ b/gtk/bootp_stat.c @@ -1,7 +1,7 @@ /* bootp_stat.c * boop_stat 2003 Jean-Michel FAYARD * - * $Id: bootp_stat.c,v 1.15 2004/01/31 03:22:39 guy Exp $ + * $Id: bootp_stat.c,v 1.16 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -33,7 +33,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" #include "tap.h" diff --git a/gtk/dcerpc_stat.c b/gtk/dcerpc_stat.c index 2a18d14483..9e918f76ed 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.46 2004/01/31 03:22:39 guy Exp $ + * $Id: dcerpc_stat.c,v 1.47 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -39,7 +39,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" #include "ui_util.h" diff --git a/gtk/endpoint_talkers_eth.c b/gtk/endpoint_talkers_eth.c index a401830bb5..f97f0ada13 100644 --- a/gtk/endpoint_talkers_eth.c +++ b/gtk/endpoint_talkers_eth.c @@ -1,7 +1,7 @@ /* endpoint_talkers_eth.c * endpoint_talkers_eth 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_eth.c,v 1.20 2004/01/03 18:05:55 sharpe Exp $ + * $Id: endpoint_talkers_eth.c,v 1.21 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_fc.c b/gtk/endpoint_talkers_fc.c index bfa849f07e..d48bb2ba23 100644 --- a/gtk/endpoint_talkers_fc.c +++ b/gtk/endpoint_talkers_fc.c @@ -1,7 +1,7 @@ /* endpoint_talkers_fc.c * endpoint_talkers_fc 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_fc.c,v 1.20 2004/01/03 18:05:55 sharpe Exp $ + * $Id: endpoint_talkers_fc.c,v 1.21 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_fddi.c b/gtk/endpoint_talkers_fddi.c index 0fec9d883e..f27b617900 100644 --- a/gtk/endpoint_talkers_fddi.c +++ b/gtk/endpoint_talkers_fddi.c @@ -1,7 +1,7 @@ /* endpoint_talkers_fddi.c * endpoint_talkers_fddi 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_fddi.c,v 1.15 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_fddi.c,v 1.16 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_ip.c b/gtk/endpoint_talkers_ip.c index 62bec1c0a0..87b10f872d 100644 --- a/gtk/endpoint_talkers_ip.c +++ b/gtk/endpoint_talkers_ip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_ip.c * endpoint_talkers_ip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_ip.c,v 1.21 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_ip.c,v 1.22 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_ipx.c b/gtk/endpoint_talkers_ipx.c index 111b07d376..26e5d205af 100644 --- a/gtk/endpoint_talkers_ipx.c +++ b/gtk/endpoint_talkers_ipx.c @@ -1,7 +1,7 @@ /* endpoint_talkers_ipx.c * endpoint_talkers_ipx 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_ipx.c,v 1.19 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_ipx.c,v 1.20 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_tcpip.c b/gtk/endpoint_talkers_tcpip.c index 99b36c03ce..a0327daf0a 100644 --- a/gtk/endpoint_talkers_tcpip.c +++ b/gtk/endpoint_talkers_tcpip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_tcpip.c * endpoint_talkers_tcpip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_tcpip.c,v 1.22 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_tcpip.c,v 1.23 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_tr.c b/gtk/endpoint_talkers_tr.c index a2123c7ddf..335809b259 100644 --- a/gtk/endpoint_talkers_tr.c +++ b/gtk/endpoint_talkers_tr.c @@ -1,7 +1,7 @@ /* endpoint_talkers_tr.c * endpoint_talkers_tr 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_tr.c,v 1.21 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_tr.c,v 1.22 2004/02/11 04:17:02 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/endpoint_talkers_udpip.c b/gtk/endpoint_talkers_udpip.c index 1ae0969057..4d77ebb321 100644 --- a/gtk/endpoint_talkers_udpip.c +++ b/gtk/endpoint_talkers_udpip.c @@ -1,7 +1,7 @@ /* endpoint_talkers_udpip.c * endpoint_talkers_udpip 2003 Ronnie Sahlberg * - * $Id: endpoint_talkers_udpip.c,v 1.22 2004/01/03 18:05:56 sharpe Exp $ + * $Id: endpoint_talkers_udpip.c,v 1.23 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -35,7 +35,7 @@ #include <gtk/gtk.h> #include <string.h> #include "epan/packet.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "endpoint_talkers_table.h" diff --git a/gtk/fc_stat.c b/gtk/fc_stat.c index 0eb4b297b7..c4637403ac 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.22 2004/01/31 03:22:39 guy Exp $ + * $Id: fc_stat.c,v 1.23 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,7 +36,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../packet-fc.h" diff --git a/gtk/gsm_a_stat.c b/gtk/gsm_a_stat.c index ebf343c383..f25a298771 100644 --- a/gtk/gsm_a_stat.c +++ b/gtk/gsm_a_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: gsm_a_stat.c,v 1.11 2004/02/06 19:19:10 ulfl Exp $ + * $Id: gsm_a_stat.c,v 1.12 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "menu.h" +#include "tap_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "simple_dialog.h" diff --git a/gtk/h225_counter.c b/gtk/h225_counter.c index d5c51af5f9..8ac5fb42db 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.9 2004/02/06 19:19:10 ulfl Exp $ + * $Id: h225_counter.c,v 1.10 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../register.h" diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 6291f69b2a..0b1c1b354c 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.8 2004/02/06 19:19:10 ulfl Exp $ + * $Id: h225_ras_srt.c,v 1.9 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../register.h" diff --git a/gtk/http_stat.c b/gtk/http_stat.c index 02b8c4730c..37a7d94044 100644 --- a/gtk/http_stat.c +++ b/gtk/http_stat.c @@ -1,7 +1,7 @@ /* http_stat.c * http_stat 2003 Jean-Michel FAYARD * - * $Id: http_stat.c,v 1.17 2004/01/31 03:22:41 guy Exp $ + * $Id: http_stat.c,v 1.18 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -32,7 +32,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" #include "tap.h" diff --git a/gtk/io_stat.c b/gtk/io_stat.c index 6eac1be01a..1c6ecca6c3 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -1,7 +1,7 @@ /* io_stat.c * io_stat 2002 Ronnie Sahlberg * - * $Id: io_stat.c,v 1.60 2004/02/11 00:55:28 guy Exp $ + * $Id: io_stat.c,v 1.61 2004/02/11 04:17:03 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,7 @@ #include "gtkglobals.h" #include "epan/epan_dissect.h" #include "epan/packet_info.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../register.h" #include "alert_box.h" diff --git a/gtk/isup_stat.c b/gtk/isup_stat.c index cbeb7875b9..36e6232b56 100644 --- a/gtk/isup_stat.c +++ b/gtk/isup_stat.c @@ -5,7 +5,7 @@ * * MUCH code modified from service_response_time_table.c. * - * $Id: isup_stat.c,v 1.14 2004/02/06 19:19:10 ulfl Exp $ + * $Id: isup_stat.c,v 1.15 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,7 +41,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" #include "epan/value_string.h" -#include "menu.h" +#include "tap_menu.h" #include "image/clist_ascend.xpm" #include "image/clist_descend.xpm" #include "simple_dialog.h" diff --git a/gtk/ldap_stat.c b/gtk/ldap_stat.c index 0b97bd3f03..ecd706c403 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.10 2004/01/31 03:22:41 guy Exp $ + * $Id: ldap_stat.c,v 1.11 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,7 +36,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../packet-ldap.h" diff --git a/gtk/menu.c b/gtk/menu.c index fce970053e..93c34eeedf 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -1,7 +1,7 @@ /* menu.c * Menu routines * - * $Id: menu.c,v 1.160 2004/02/11 03:55:48 guy Exp $ + * $Id: menu.c,v 1.161 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -33,6 +33,7 @@ #include "main.h" #include "menu.h" +#include "tap_menu.h" #include <epan/packet.h> #include <epan/resolv.h> #include "prefs.h" diff --git a/gtk/menu.h b/gtk/menu.h index e264701a68..ef7b20f9ce 100644 --- a/gtk/menu.h +++ b/gtk/menu.h @@ -1,7 +1,7 @@ /* menu.h * Menu definitions * - * $Id: menu.h,v 1.16 2004/02/01 20:28:11 ulfl Exp $ + * $Id: menu.h,v 1.17 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -38,34 +38,6 @@ GtkWidget *main_menu_new(GtkAccelGroup **); void set_menu_object_data (gchar *path, gchar *key, gpointer data); gint popup_menu_handler(GtkWidget *widget, GdkEvent *event, gpointer data); - -/* - * Add a new menu item for a tap. - * This must be called after we've created the main menu, so it can't - * be called from the routine that registers taps - we have to introduce - * another per-tap registration routine. - * - * "callback" gets called when the menu item is selected; it should do - * the work of creating the tap window. - * - * "selected_packet_enabled" gets called by "set_menus_for_selected_packet()"; - * it's passed a pointer to the "frame_data" structure for the current frame, - * if any, and to the "epan_dissect_t" structure for that frame, if any, and - * should return TRUE if the tap will work now (which might depend on whether - * a frame is selected and, if one is, on the frame) and FALSE if not. - * - * "selected_tree_row_enabled" gets called by - * "set_menus_for_selected_tree_row()"; it's passed a pointer to the - * "field_info" structure for the currently selected field, if any, - * and should return TRUE if the tap will work now (which might depend on - * whether a tree row is selected and, if one is, on the tree row) and - * FALSE if not. - */ -extern void register_tap_menu_item(char *name, GtkItemFactoryCallback callback, - gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), - gboolean (*selected_tree_row_enabled)(field_info *), - gpointer callback_data); - extern GtkWidget *popup_menu_object; #ifdef __cplusplus diff --git a/gtk/mgcp_stat.c b/gtk/mgcp_stat.c index bcd262fd7c..6a189fa65a 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.25 2004/02/06 19:19:10 ulfl Exp $ + * $Id: mgcp_stat.c,v 1.26 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../register.h" diff --git a/gtk/rpc_progs.c b/gtk/rpc_progs.c index af9821ef8b..a8aeb8ac19 100644 --- a/gtk/rpc_progs.c +++ b/gtk/rpc_progs.c @@ -1,7 +1,7 @@ /* rpc_progs.c * rpc_progs 2002 Ronnie Sahlberg * - * $Id: rpc_progs.c,v 1.16 2004/01/03 18:05:56 sharpe Exp $ + * $Id: rpc_progs.c,v 1.17 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "tap.h" #include "../register.h" #include "packet-rpc.h" diff --git a/gtk/rpc_stat.c b/gtk/rpc_stat.c index cf548730a6..cdd8b533cf 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.35 2004/01/31 03:22:42 guy Exp $ + * $Id: rpc_stat.c,v 1.36 2004/02/11 04:17:04 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -37,7 +37,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" #include "tap.h" diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index d6c8ae74a8..0e693db716 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -1,7 +1,7 @@ /* rtp_analysis.c * RTP analysis addition for ethereal * - * $Id: rtp_analysis.c,v 1.34 2004/02/11 01:37:13 guy Exp $ + * $Id: rtp_analysis.c,v 1.35 2004/02/11 04:17:04 guy Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -62,7 +62,7 @@ #include "ui_util.h" #include "alert_box.h" #include "simple_dialog.h" -#include "menu.h" +#include "tap_menu.h" #include "main.h" #include "progress_dlg.h" #include "compat_macros.h" diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 4fe9bcdb41..d310ab7aaa 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.13 2004/02/06 19:19:11 ulfl Exp $ + * $Id: rtp_stream_dlg.c,v 1.14 2004/02/11 04:17:04 guy Exp $ * * Copyright 2003, Alcatel Business Systems * By Lars Ruoff <lars.ruoff@gmx.net> @@ -36,7 +36,7 @@ #include "globals.h" #include "epan/filesystem.h" -#include "menu.h" +#include "tap_menu.h" #include "dlg_utils.h" #include "ui_util.h" #include "main.h" diff --git a/gtk/smb_stat.c b/gtk/smb_stat.c index 2867cfbb69..8fd3912860 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.33 2004/01/31 03:22:42 guy Exp $ + * $Id: smb_stat.c,v 1.34 2004/02/11 04:17:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,7 +36,7 @@ #include <string.h> #include "../epan/packet_info.h" #include "../epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "../tap.h" #include "../epan/value_string.h" #include "../smb.h" diff --git a/gtk/tap_menu.h b/gtk/tap_menu.h new file mode 100644 index 0000000000..7d4b42faab --- /dev/null +++ b/gtk/tap_menu.h @@ -0,0 +1,63 @@ +/* tap_menu.h + * Menu definitions for use by taps + * + * $Id: tap_menu.h,v 1.1 2004/02/11 04:17:05 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __GTKGUITAPMENU_H__ +#define __GTKGUITAPMENU_H__ + +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + +/* + * Add a new menu item for a tap. + * This must be called after we've created the main menu, so it can't + * be called from the routine that registers taps - we have to introduce + * another per-tap registration routine. + * + * "callback" gets called when the menu item is selected; it should do + * the work of creating the tap window. + * + * "selected_packet_enabled" gets called by "set_menus_for_selected_packet()"; + * it's passed a pointer to the "frame_data" structure for the current frame, + * if any, and to the "epan_dissect_t" structure for that frame, if any, and + * should return TRUE if the tap will work now (which might depend on whether + * a frame is selected and, if one is, on the frame) and FALSE if not. + * + * "selected_tree_row_enabled" gets called by + * "set_menus_for_selected_tree_row()"; it's passed a pointer to the + * "field_info" structure for the currently selected field, if any, + * and should return TRUE if the tap will work now (which might depend on + * whether a tree row is selected and, if one is, on the tree row) and + * FALSE if not. + */ +extern void register_tap_menu_item(char *name, GtkItemFactoryCallback callback, + gboolean (*selected_packet_enabled)(frame_data *, epan_dissect_t *), + gboolean (*selected_tree_row_enabled)(field_info *), + gpointer callback_data); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + +#endif /* __GTKGUITAPMENU_H__ */ diff --git a/gtk/wsp_stat.c b/gtk/wsp_stat.c index 663edb1815..afd9ceeba9 100644 --- a/gtk/wsp_stat.c +++ b/gtk/wsp_stat.c @@ -1,7 +1,7 @@ /* wsp_stat.c * wsp_stat 2003 Jean-Michel FAYARD * - * $Id: wsp_stat.c,v 1.15 2004/01/31 03:22:42 guy Exp $ + * $Id: wsp_stat.c,v 1.16 2004/02/11 04:17:05 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -33,7 +33,7 @@ #include "epan/packet_info.h" #include "epan/epan.h" -#include "menu.h" +#include "tap_menu.h" #include "simple_dialog.h" #include "dlg_utils.h" #include "tap.h" |