diff options
37 files changed, 380 insertions, 607 deletions
diff --git a/gtk/conversations_eth.c b/gtk/conversations_eth.c index a8e450ad58..d95be3e535 100644 --- a/gtk/conversations_eth.c +++ b/gtk/conversations_eth.c @@ -43,7 +43,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int eth_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -72,13 +71,20 @@ eth_conversation_init(const char *optarg, void* userdata _U_) } +#ifdef MAIN_MENU_USE_UIMANAGER +void +eth_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + eth_conversation_init("conv,eth",NULL); +} +#else static void -eth_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) +eth_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) { eth_conversation_init("conv,eth",NULL); } - +#endif void register_tap_listener_eth_conversation(void) @@ -86,23 +92,10 @@ register_tap_listener_eth_conversation(void) register_stat_cmd_arg("conv,eth", eth_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "Ethernet", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "Ethernet", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(eth_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Ethernet", REGISTER_STAT_GROUP_CONVERSATION_LIST, eth_endpoints_cb, NULL, NULL, NULL); #endif + register_conversation_table(TRUE, "Ethernet", "eth", NULL /*filter*/, eth_conversation_packet); } diff --git a/gtk/conversations_fc.c b/gtk/conversations_fc.c index 18cb03ab59..11e5bd3a2e 100644 --- a/gtk/conversations_fc.c +++ b/gtk/conversations_fc.c @@ -44,7 +44,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int @@ -74,13 +73,19 @@ fc_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +fc_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + fc_conversation_init("conv,fc",NULL); +} +#else static void fc_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { fc_conversation_init("conv,fc",NULL); } - +#endif void register_tap_listener_fc_conversation(void) @@ -88,20 +93,6 @@ register_tap_listener_fc_conversation(void) register_stat_cmd_arg("conv,fc", fc_conversation_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "Fibre Channel", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "Fibre Channel", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(fc_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Fibre Channel", REGISTER_STAT_GROUP_CONVERSATION_LIST, fc_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_fddi.c b/gtk/conversations_fddi.c index a04c01b53d..5538d281d4 100644 --- a/gtk/conversations_fddi.c +++ b/gtk/conversations_fddi.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int fddi_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -71,13 +70,19 @@ fddi_conversation_init(const char *optarg, void* userdata _U_ ) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +fddi_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + fddi_conversation_init("conv,fddi",NULL); +} +#else static void fddi_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { fddi_conversation_init("conv,fddi",NULL); } - +#endif void register_tap_listener_fddi_conversation(void) @@ -85,20 +90,6 @@ register_tap_listener_fddi_conversation(void) register_stat_cmd_arg("conv,fddi", fddi_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "FDDI", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "FDDI", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(fddi_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("FDDI", REGISTER_STAT_GROUP_CONVERSATION_LIST, fddi_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_ip.c b/gtk/conversations_ip.c index b6fd7ce2af..b542e0719a 100644 --- a/gtk/conversations_ip.c +++ b/gtk/conversations_ip.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int ip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -69,13 +68,19 @@ ip_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ip_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + ip_conversation_init("conv,ip",NULL); +} +#else static void ip_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { ip_conversation_init("conv,ip",NULL); } - +#endif void register_tap_listener_ip_conversation(void) @@ -83,19 +88,6 @@ register_tap_listener_ip_conversation(void) register_stat_cmd_arg("conv,ip", ip_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "IPv4", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "IPv4", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(ip_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ #else register_stat_menu_item("IPv4", REGISTER_STAT_GROUP_CONVERSATION_LIST, ip_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_ipv6.c b/gtk/conversations_ipv6.c index 350e541199..3ab12799d7 100644 --- a/gtk/conversations_ipv6.c +++ b/gtk/conversations_ipv6.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int ipv6_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -78,13 +77,19 @@ ipv6_conversation_init(const char *optarg, void *userdata _U_) init_conversation_table(TRUE, "IPv6", "ipv6", filter, ipv6_conversation_packet); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ipv6_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + ipv6_conversation_init("conv,ipv6", NULL); +} +#else static void ipv6_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { ipv6_conversation_init("conv,ipv6", NULL); } - +#endif void register_tap_listener_ipv6_conversation(void) @@ -92,20 +97,6 @@ register_tap_listener_ipv6_conversation(void) register_stat_cmd_arg("conv,ipv6", ipv6_conversation_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "IPv6", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "IPv6", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(ipv6_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IPv6", REGISTER_STAT_GROUP_CONVERSATION_LIST, ipv6_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_ipx.c b/gtk/conversations_ipx.c index f003b7074d..1647c742b4 100644 --- a/gtk/conversations_ipx.c +++ b/gtk/conversations_ipx.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int @@ -72,13 +71,19 @@ ipx_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ipx_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + ipx_conversation_init("conv,ipx",NULL); +} +#else static void ipx_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { ipx_conversation_init("conv,ipx",NULL); } - +#endif void register_tap_listener_ipx_conversation(void) @@ -86,20 +91,6 @@ register_tap_listener_ipx_conversation(void) register_stat_cmd_arg("conv,ipx", ipx_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "IPX", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "IPX", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(ipx_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IPX", REGISTER_STAT_GROUP_CONVERSATION_LIST, ipx_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_jxta.c b/gtk/conversations_jxta.c index 5d2641ed79..9e734435d9 100644 --- a/gtk/conversations_jxta.c +++ b/gtk/conversations_jxta.c @@ -43,7 +43,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int jxta_conversation_packet(void *pct, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) @@ -80,13 +79,19 @@ jxta_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +jxta_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + jxta_conversation_init("conv,jxta",NULL); +} +#else static void jxta_conversation_cb(GtkWidget *w _U_, gpointer d _U_) { jxta_conversation_init("conv,jxta",NULL); } - +#endif void register_tap_listener_jxta_conversation(void) @@ -94,20 +99,6 @@ register_tap_listener_jxta_conversation(void) register_stat_cmd_arg("conv,jxta", jxta_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "JXTA", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "JXTA", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(jxta_conversation_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("JXTA", REGISTER_STAT_GROUP_CONVERSATION_LIST, jxta_conversation_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_ncp.c b/gtk/conversations_ncp.c index f41039e6de..728d6bb7ff 100644 --- a/gtk/conversations_ncp.c +++ b/gtk/conversations_ncp.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int ncp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -72,13 +71,19 @@ ncp_conversation_init(const char *optarg, void* userdata _U_) init_conversation_table(FALSE, "NCP", "ncp_hdr", filter, ncp_conversation_packet); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +ncp_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + ncp_conversation_init("conv,ncp",NULL); +} +#else static void ncp_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { ncp_conversation_init("conv,ncp",NULL); } - +#endif void register_tap_listener_ncp_conversation(void) @@ -86,20 +91,6 @@ register_tap_listener_ncp_conversation(void) register_stat_cmd_arg("conv,ncp", ncp_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "NCP", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "NCP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(ncp_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("NCP", REGISTER_STAT_GROUP_CONVERSATION_LIST, ncp_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_rsvp.c b/gtk/conversations_rsvp.c index 0d1772a71d..e7745e6573 100644 --- a/gtk/conversations_rsvp.c +++ b/gtk/conversations_rsvp.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int rsvp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -72,13 +71,19 @@ rsvp_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +rsvp_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + rsvp_conversation_init("conv,rsvp",NULL); +} +#else static void rsvp_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { rsvp_conversation_init("conv,rsvp",NULL); } - +#endif void register_tap_listener_rsvp_conversation(void) @@ -86,20 +91,6 @@ register_tap_listener_rsvp_conversation(void) register_stat_cmd_arg("conv,rsvp", rsvp_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "RSVP", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "RSVP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(rsvp_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("RSVP", REGISTER_STAT_GROUP_CONVERSATION_LIST, rsvp_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_sctp.c b/gtk/conversations_sctp.c index d51148a7c9..90a1795e93 100644 --- a/gtk/conversations_sctp.c +++ b/gtk/conversations_sctp.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int sctp_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -81,13 +80,19 @@ sctp_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +sctp_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + sctp_conversation_init("conv,sctp",NULL); +} +#else static void sctp_conversation_cb(GtkWidget *w _U_, gpointer d _U_) { sctp_conversation_init("conv,sctp",NULL); } - +#endif void register_tap_listener_sctp_conversation(void) @@ -95,20 +100,6 @@ register_tap_listener_sctp_conversation(void) register_stat_cmd_arg("conv,sctp", sctp_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "SCTP", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "SCTP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(sctp_conversation_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("SCTP", REGISTER_STAT_GROUP_CONVERSATION_LIST, sctp_conversation_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_tcpip.c b/gtk/conversations_tcpip.c index dc40825741..38a27095a8 100644 --- a/gtk/conversations_tcpip.c +++ b/gtk/conversations_tcpip.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int tcpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -71,13 +70,19 @@ tcpip_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +tcpip_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + tcpip_conversation_init("conv,tcp",NULL); +} +#else static void tcpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_) { tcpip_conversation_init("conv,tcp",NULL); } - +#endif void register_tap_listener_tcpip_conversation(void) @@ -85,20 +90,6 @@ register_tap_listener_tcpip_conversation(void) register_stat_cmd_arg("conv,tcp", tcpip_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "TCP (IPv4 & IPv6)", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "TCP (IPv4 & IPv6)", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(tcpip_conversation_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_CONVERSATION_LIST, tcpip_conversation_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c index ceb6e729f0..0f2549095d 100644 --- a/gtk/conversations_tr.c +++ b/gtk/conversations_tr.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int tr_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -71,13 +70,19 @@ tr_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +tr_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + tr_conversation_init("conv,tr",NULL); +} +#else static void tr_conversation_cb(GtkWidget *w _U_, gpointer d _U_) { tr_conversation_init("conv,tr",NULL); } - +#endif void register_tap_listener_tr_conversation(void) @@ -85,20 +90,6 @@ register_tap_listener_tr_conversation(void) register_stat_cmd_arg("conv,tr", tr_conversation_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "Token Ring", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "Token Ring", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(tr_conversation_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Token Ring", REGISTER_STAT_GROUP_CONVERSATION_LIST, tr_conversation_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_udpip.c b/gtk/conversations_udpip.c index cb0568c491..f0482808f6 100644 --- a/gtk/conversations_udpip.c +++ b/gtk/conversations_udpip.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int udpip_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -71,13 +70,19 @@ udpip_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +udpip_conversation_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + udpip_conversation_init("conv,udp",NULL); +} +#else static void udpip_conversation_cb(GtkWidget *w _U_, gpointer d _U_) { udpip_conversation_init("conv,udp",NULL); } - +#endif void register_tap_listener_udpip_conversation(void) @@ -85,20 +90,6 @@ register_tap_listener_udpip_conversation(void) register_stat_cmd_arg("conv,udp", udpip_conversation_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "UDP (IPv4 & IPv6)", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "UDP (IPv4 & IPv6)", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(udpip_conversation_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("UDP (IPv4 & IPv6)", REGISTER_STAT_GROUP_CONVERSATION_LIST, udpip_conversation_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_usb.c b/gtk/conversations_usb.c index f37952e292..80279f2362 100644 --- a/gtk/conversations_usb.c +++ b/gtk/conversations_usb.c @@ -41,7 +41,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int usb_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) @@ -68,13 +67,19 @@ usb_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +usb_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + usb_conversation_init("conv,usb", NULL); +} +#else static void usb_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { usb_conversation_init("conv,usb", NULL); } - +#endif void register_tap_listener_usb_conversation(void) @@ -82,20 +87,6 @@ register_tap_listener_usb_conversation(void) register_stat_cmd_arg("conv,usb", usb_conversation_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "USB", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "USB", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(usb_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("USB", REGISTER_STAT_GROUP_CONVERSATION_LIST, usb_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/conversations_wlan.c b/gtk/conversations_wlan.c index 0affa99fab..62bda45d05 100644 --- a/gtk/conversations_wlan.c +++ b/gtk/conversations_wlan.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/conversations_table.h" -#include "gtk/stock_icons.h" static int wlan_conversation_packet(void *pct, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -71,13 +70,19 @@ wlan_conversation_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +wlan_endpoints_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + wlan_conversation_init("conv,wlan",NULL); +} +#else static void wlan_endpoints_cb(GtkWidget *w _U_, gpointer d _U_) { wlan_conversation_init("conv,wlan",NULL); } - +#endif void register_tap_listener_wlan_conversation(void) @@ -85,20 +90,6 @@ register_tap_listener_wlan_conversation(void) register_stat_cmd_arg("conv,wlan", wlan_conversation_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_CONVERSATION_LIST, /* Group */ - "/Menubar/StatisticsMenu/ConversationListMenu/List-item", /* GUI path */ - "WLAN", /* Name */ - WIRESHARK_STOCK_CONVERSATIONS, /* stock_id */ - "WLAN", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(wlan_endpoints_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("WLAN", REGISTER_STAT_GROUP_CONVERSATION_LIST, wlan_endpoints_cb, NULL, NULL, NULL); diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index f5818fc997..c64dcc13a7 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -795,19 +795,6 @@ register_tap_listener_expert_comp(void) { register_stat_cmd_arg("expert_comp", expert_comp_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_ANALYZE_GROUP_UNSORTED, /* Group */ - "/Menubar/AnalyzeMenu/ExpertInfoComposite", /* GUI path */ - "Expert-Info-Composite", /* Name */ - WIRESHARK_STOCK_EXPERT_INFO, /* stock_id */ - "Expert Info _Composite", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(expert_comp_dlg_launch), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ #else register_stat_menu_item_stock("Expert Info _Composite", REGISTER_ANALYZE_GROUP_UNSORTED, WIRESHARK_STOCK_EXPERT_INFO, diff --git a/gtk/flow_graph.c b/gtk/flow_graph.c index ce9d7b8b51..099f7c90d9 100644 --- a/gtk/flow_graph.c +++ b/gtk/flow_graph.c @@ -664,7 +664,7 @@ flow_graph_init_tap(const char *dummy _U_, void* userdata _U_) /****************************************************************************/ /* entry point when called via the GTK menu */ #ifdef MAIN_MENU_USE_UIMANAGER -static void +void flow_graph_launch(GtkAction *action _U_, gpointer user_data _U_) { flow_graph_init_tap("",NULL); @@ -683,19 +683,6 @@ register_tap_listener_flow_graph(void) { register_stat_cmd_arg("flow_graph",flow_graph_init_tap,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_UNSORTED, /* Group */ - "/Menubar/StatisticsMenu/FlowGraph", /* GUI path */ - "Flow-Graph", /* Name */ - WIRESHARK_STOCK_FLOW_GRAPH, /* stock_id */ - "Flo_w Graph...", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(flow_graph_launch), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ #else register_stat_menu_item_stock("Flo_w Graph...", REGISTER_STAT_GROUP_UNSORTED, WIRESHARK_STOCK_FLOW_GRAPH, diff --git a/gtk/gui_stat_menu.h b/gtk/gui_stat_menu.h index e304f21bf8..1d169d8834 100644 --- a/gtk/gui_stat_menu.h +++ b/gtk/gui_stat_menu.h @@ -96,8 +96,48 @@ extern void register_stat_menu_item( * * @param callback_data data for callback function */ -//#define MAIN_MENU_USE_UIMANAGER 1 +#define MAIN_MENU_USE_UIMANAGER 1 #ifdef MAIN_MENU_USE_UIMANAGER +void eth_endpoints_cb(GtkAction *action, gpointer user_data); +void fc_endpoints_cb(GtkAction *action, gpointer user_data); +void fddi_endpoints_cb(GtkAction *action, gpointer user_data); +void ip_endpoints_cb(GtkAction *action, gpointer user_data); +void ipv6_endpoints_cb(GtkAction *action, gpointer user_data); +void ipx_endpoints_cb(GtkAction *action, gpointer user_data); +void jxta_conversation_cb(GtkAction *action, gpointer user_data); +void ncp_endpoints_cb(GtkAction *action, gpointer user_data); +void rsvp_endpoints_cb(GtkAction *action, gpointer user_data); +void sctp_conversation_cb(GtkAction *action, gpointer user_data); +void tcpip_conversation_cb(GtkAction *action, gpointer user_data); +void tr_conversation_cb(GtkAction *action, gpointer user_data); +void udpip_conversation_cb(GtkAction *action, gpointer user_data); +void usb_endpoints_cb(GtkAction *action, gpointer user_data); +void wlan_endpoints_cb(GtkAction *action, gpointer user_data); + +void gtk_eth_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_fc_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_fddi_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_ip_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_ipv6_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_ipx_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_jxta_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_ncp_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_rsvp_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_sctp_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_tcpip_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_tr_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_udpip_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_usb_hostlist_cb(GtkAction *action, gpointer user_data); +void gtk_wlan_hostlist_cb(GtkAction *action, gpointer user_data); + +void flow_graph_launch(GtkAction *action, gpointer user_data); + +void iax2_analysis_cb(GtkAction *action, gpointer user_data); + +void gui_iostat_cb(GtkAction *action, gpointer user_data); + +void voip_calls_launch(GtkAction *action, gpointer user_data); + extern void register_stat_menu_item_stock( register_stat_group_t group, const char *gui_path, diff --git a/gtk/hostlist_eth.c b/gtk/hostlist_eth.c index 6914193895..fa9fa80182 100644 --- a/gtk/hostlist_eth.c +++ b/gtk/hostlist_eth.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int @@ -78,13 +77,19 @@ gtk_eth_hostlist_init(const char *optarg, } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_eth_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_eth_hostlist_init("hosts,eth",NULL); +} +#else static void gtk_eth_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_eth_hostlist_init("hosts,eth",NULL); } - +#endif void register_tap_listener_eth_hostlist(void) @@ -92,24 +97,9 @@ register_tap_listener_eth_hostlist(void) register_stat_cmd_arg("hosts,eth", gtk_eth_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "Ethernet", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "Ethernet", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_eth_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Ethernet", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_eth_hostlist_cb, NULL, NULL, NULL); #endif - register_hostlist_table(TRUE, "Ethernet", "eth", NULL /*filter*/, eth_hostlist_packet); } diff --git a/gtk/hostlist_fc.c b/gtk/hostlist_fc.c index 869643862a..ddac218fe2 100644 --- a/gtk/hostlist_fc.c +++ b/gtk/hostlist_fc.c @@ -44,7 +44,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int @@ -79,13 +78,19 @@ gtk_fc_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_fc_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_fc_hostlist_init("hosts,fc",NULL); +} +#else static void gtk_fc_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_fc_hostlist_init("hosts,fc",NULL); } - +#endif void register_tap_listener_fc_hostlist(void) @@ -93,20 +98,6 @@ register_tap_listener_fc_hostlist(void) register_stat_cmd_arg("hosts,fc", gtk_fc_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "Fibre Channel", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "Fibre Channel", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_fc_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Fibre Channel", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_fc_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_fddi.c b/gtk/hostlist_fddi.c index 8fb188cf86..9a11e0b630 100644 --- a/gtk/hostlist_fddi.c +++ b/gtk/hostlist_fddi.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int fddi_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -76,37 +75,27 @@ gtk_fddi_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_fddi_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_fddi_hostlist_init("hosts,fddi",NULL); +} +#else static void gtk_fddi_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_fddi_hostlist_init("hosts,fddi",NULL); } - +#endif void register_tap_listener_fddi_hostlist(void) { register_stat_cmd_arg("hosts,fddi", gtk_fddi_hostlist_init,NULL); -#ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "FDDI", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "FDDI", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_fddi_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - -#else register_stat_menu_item("FDDI", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_fddi_hostlist_cb, NULL, NULL, NULL); -#endif + register_hostlist_table(TRUE, "FDDI", "fddi", NULL /*filter*/, fddi_hostlist_packet); } diff --git a/gtk/hostlist_ip.c b/gtk/hostlist_ip.c index f794aaabbc..e1fb7f405d 100644 --- a/gtk/hostlist_ip.c +++ b/gtk/hostlist_ip.c @@ -44,7 +44,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int ip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -75,13 +74,19 @@ gtk_ip_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_ip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_ip_hostlist_init("hosts,ip",NULL); +} +#else static void gtk_ip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_ip_hostlist_init("hosts,ip",NULL); } - +#endif void register_tap_listener_ip_hostlist(void) @@ -89,20 +94,6 @@ register_tap_listener_ip_hostlist(void) register_stat_cmd_arg("hosts,ip", gtk_ip_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "IPv4", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "IPv4", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_ip_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IPv4", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_ip_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_ipv6.c b/gtk/hostlist_ipv6.c index e304529208..281d4a3ef7 100644 --- a/gtk/hostlist_ipv6.c +++ b/gtk/hostlist_ipv6.c @@ -45,7 +45,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int ipv6_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -82,13 +81,19 @@ gtk_ipv6_hostlist_init(const char *optarg, void* userdata _U_) init_hostlist_table(TRUE, "IPv6", "ipv6", filter, ipv6_hostlist_packet); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_ipv6_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_ipv6_hostlist_init("hosts,ipv6", NULL); +} +#else static void gtk_ipv6_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_ipv6_hostlist_init("hosts,ipv6", NULL); } - +#endif void register_tap_listener_ipv6_hostlist(void) @@ -96,20 +101,6 @@ register_tap_listener_ipv6_hostlist(void) register_stat_cmd_arg("hosts,ipv6", gtk_ipv6_hostlist_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "IPv6", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "IPv6", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_ipv6_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IPv6", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_ipv6_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_ipx.c b/gtk/hostlist_ipx.c index 66679fe1bc..59f76d5fc4 100644 --- a/gtk/hostlist_ipx.c +++ b/gtk/hostlist_ipx.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int ipx_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -76,12 +75,19 @@ gtk_ipx_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_ipx_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_ipx_hostlist_init("hosts,ipx",NULL); +} +#else static void gtk_ipx_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_ipx_hostlist_init("hosts,ipx",NULL); } +#endif void @@ -90,20 +96,6 @@ register_tap_listener_ipx_hostlist(void) register_stat_cmd_arg("hosts,ipx", gtk_ipx_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "IPX", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "IPX", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_ipx_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IPX", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_ipx_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_jxta.c b/gtk/hostlist_jxta.c index c3f66ab41d..09f9f321ec 100644 --- a/gtk/hostlist_jxta.c +++ b/gtk/hostlist_jxta.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int jxta_hostlist_packet(void *pit, packet_info *pinfo _U_, epan_dissect_t *edt _U_, const void *vip) @@ -73,13 +72,18 @@ gtk_jxta_hostlist_init(const char *optarg, void* userdata _U_) } - -static void +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_jxta_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_jxta_hostlist_init("hosts,jxta",NULL); +} +#else gtk_jxta_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_jxta_hostlist_init("hosts,jxta",NULL); } - +#endif void register_tap_listener_jxta_hostlist(void) @@ -87,20 +91,6 @@ register_tap_listener_jxta_hostlist(void) register_stat_cmd_arg("hosts,jxta", gtk_jxta_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "JXTA", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "JXTA", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_jxta_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("JXTA", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_jxta_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_ncp.c b/gtk/hostlist_ncp.c index 701351c344..f2de1db040 100644 --- a/gtk/hostlist_ncp.c +++ b/gtk/hostlist_ncp.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int ncp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) @@ -74,13 +73,19 @@ gtk_ncp_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_ncp_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_ncp_hostlist_init("hosts,ncp",NULL); +} +#else static void gtk_ncp_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_ncp_hostlist_init("hosts,ncp",NULL); } - +#endif void register_tap_listener_ncp_hostlist(void) @@ -88,20 +93,6 @@ register_tap_listener_ncp_hostlist(void) register_stat_cmd_arg("hosts,ncp", gtk_ncp_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "NCP", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "NCP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_ncp_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("NCP", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_ncp_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_rsvp.c b/gtk/hostlist_rsvp.c index f8bdac0673..396bf56f67 100644 --- a/gtk/hostlist_rsvp.c +++ b/gtk/hostlist_rsvp.c @@ -44,7 +44,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int rsvp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -80,13 +79,19 @@ gtk_rsvp_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_rsvp_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_rsvp_hostlist_init("hosts,rsvp",NULL); +} +#else static void gtk_rsvp_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_rsvp_hostlist_init("hosts,rsvp",NULL); } - +#endif void register_tap_listener_rsvp_hostlist(void) @@ -94,20 +99,6 @@ register_tap_listener_rsvp_hostlist(void) register_stat_cmd_arg("hosts,rsvp", gtk_rsvp_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "RSVP", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "RSVP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_rsvp_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("RSVP", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_rsvp_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_sctp.c b/gtk/hostlist_sctp.c index 7023a865f8..a9a3f5ce94 100644 --- a/gtk/hostlist_sctp.c +++ b/gtk/hostlist_sctp.c @@ -41,7 +41,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int sctp_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -74,13 +73,19 @@ gtk_sctp_hostlist_init(const char *optarg, void* userdata _U_) init_hostlist_table(FALSE, "SCTP", "sctp", filter, sctp_hostlist_packet); } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_sctp_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_sctp_hostlist_init("hosts,sctp",NULL); +} +#else static void gtk_sctp_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_sctp_hostlist_init("hosts,sctp",NULL); } - +#endif void register_tap_listener_sctp_hostlist(void) @@ -88,20 +93,6 @@ register_tap_listener_sctp_hostlist(void) register_stat_cmd_arg("hosts,sctp", gtk_sctp_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "SCTP", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "SCTP", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_sctp_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("SCTP", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_sctp_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_tcpip.c b/gtk/hostlist_tcpip.c index 972816548e..0b0ca51299 100644 --- a/gtk/hostlist_tcpip.c +++ b/gtk/hostlist_tcpip.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int tcpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -76,13 +75,19 @@ gtk_tcpip_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_tcpip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_tcpip_hostlist_init("endpoints,tcp",NULL); +} +#else static void gtk_tcpip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_tcpip_hostlist_init("endpoints,tcp",NULL); } - +#endif void register_tap_listener_tcpip_hostlist(void) @@ -90,20 +95,6 @@ register_tap_listener_tcpip_hostlist(void) register_stat_cmd_arg("endpoints,tcp", gtk_tcpip_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "TCP (IPv4 & IPv6)", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "TCP (IPv4 & IPv6)", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_tcpip_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("TCP (IPv4 & IPv6)", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_tcpip_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_tr.c b/gtk/hostlist_tr.c index 14b7a5dabe..4097afee24 100644 --- a/gtk/hostlist_tr.c +++ b/gtk/hostlist_tr.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int tr_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -76,13 +75,19 @@ gtk_tr_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_tr_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_tr_hostlist_init("hosts,tr",NULL); +} +#else static void gtk_tr_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_tr_hostlist_init("hosts,tr",NULL); } - +#endif void register_tap_listener_tr_hostlist(void) @@ -90,20 +95,6 @@ register_tap_listener_tr_hostlist(void) register_stat_cmd_arg("hosts,tr", gtk_tr_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "Token Ring", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "Token Ring", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_tr_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("Token Ring", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_tr_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_udpip.c b/gtk/hostlist_udpip.c index dc3af7ebf6..1e999064fe 100644 --- a/gtk/hostlist_udpip.c +++ b/gtk/hostlist_udpip.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int udpip_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -76,13 +75,19 @@ gtk_udpip_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_udpip_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_udpip_hostlist_init("endpoints,udp",NULL); +} +#else static void gtk_udpip_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_udpip_hostlist_init("endpoints,udp",NULL); } - +#endif void register_tap_listener_udpip_hostlist(void) @@ -90,20 +95,6 @@ register_tap_listener_udpip_hostlist(void) register_stat_cmd_arg("endpoints,udp", gtk_udpip_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "Token Ring", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "Token Ring", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_udpip_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("UDP (IPv4 & IPv6)", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_udpip_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_usb.c b/gtk/hostlist_usb.c index 3dbd0148cd..41243137b2 100644 --- a/gtk/hostlist_usb.c +++ b/gtk/hostlist_usb.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int usb_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip _U_) @@ -73,13 +72,19 @@ gtk_usb_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_usb_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_usb_hostlist_init("hosts,usb", NULL); +} +#else static void gtk_usb_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_usb_hostlist_init("hosts,usb", NULL); } - +#endif void register_tap_listener_usb_hostlist(void) @@ -87,20 +92,6 @@ register_tap_listener_usb_hostlist(void) register_stat_cmd_arg("hosts,usb", gtk_usb_hostlist_init, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "USB", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "USB", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_usb_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("USB", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_usb_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/hostlist_wlan.c b/gtk/hostlist_wlan.c index 5fc086311a..cbf1d20557 100644 --- a/gtk/hostlist_wlan.c +++ b/gtk/hostlist_wlan.c @@ -42,7 +42,6 @@ #include "gtk/gui_stat_menu.h" #include "gtk/hostlist_table.h" -#include "gtk/stock_icons.h" static int wlan_hostlist_packet(void *pit, packet_info *pinfo, epan_dissect_t *edt _U_, const void *vip) @@ -74,13 +73,19 @@ gtk_wlan_hostlist_init(const char *optarg, void* userdata _U_) } - +#ifdef MAIN_MENU_USE_UIMANAGER +void +gtk_wlan_hostlist_cb(GtkAction *action _U_, gpointer user_data _U_) +{ + gtk_wlan_hostlist_init("hosts,wlan",NULL); +} +#else static void gtk_wlan_hostlist_cb(GtkWidget *w _U_, gpointer d _U_) { gtk_wlan_hostlist_init("hosts,wlan",NULL); } - +#endif void register_tap_listener_wlan_hostlist(void) @@ -88,20 +93,6 @@ register_tap_listener_wlan_hostlist(void) register_stat_cmd_arg("hosts,wlan", gtk_wlan_hostlist_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_ENDPOINT_LIST, /* Group */ - "/Menubar/StatisticsMenu/EndpointListMenu/Endpoint-List-item", /* GUI path */ - "WLAN", /* Name */ - WIRESHARK_STOCK_ENDPOINTS, /* stock_id */ - "WLAN", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gtk_wlan_hostlist_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("WLAN", REGISTER_STAT_GROUP_ENDPOINT_LIST, gtk_wlan_hostlist_cb, NULL, NULL, NULL); diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c index a08b4e72d0..6ef1558a9b 100644 --- a/gtk/iax2_analysis.c +++ b/gtk/iax2_analysis.c @@ -3407,7 +3407,11 @@ void iax2_analysis( /****************************************************************************/ /* entry point from main menu */ +#ifdef MAIN_MENU_USE_UIMANAGER +void iax2_analysis_cb(GtkAction *action _U_, gpointer user_data _U_) +#else static void iax2_analysis_cb(GtkWidget *w _U_, gpointer data _U_) +#endif { address ip_src_fwd; guint16 port_src_fwd; @@ -3547,20 +3551,6 @@ register_tap_listener_iax2_analysis(void) register_stat_cmd_arg("IAX2", iax2_analysis_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_TELEPHONY, /* Group */ - "/Menubar/TelephonyMenu/IAX2menu/StreamAnalysis", /* GUI path */ - "Stream-Analysis", /* Name */ - NULL, /* stock_id */ - "Stream Analysis...", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(iax2_analysis_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item("IA_X2/Stream Analysis...", REGISTER_STAT_GROUP_TELEPHONY, iax2_analysis_cb, NULL, NULL, NULL); diff --git a/gtk/io_stat.c b/gtk/io_stat.c index c381cd4596..84a3925212 100644 --- a/gtk/io_stat.c +++ b/gtk/io_stat.c @@ -2166,7 +2166,7 @@ init_io_stat_window(io_stat_t *io) } #ifdef MAIN_MENU_USE_UIMANAGER -static void +void gui_iostat_cb(GtkAction *action _U_, gpointer user_data _U_) { iostat_init(NULL,NULL); @@ -2185,20 +2185,6 @@ register_tap_listener_gtk_iostat(void) register_stat_cmd_arg("io,stat", iostat_init,NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_GENERIC, /* Group */ - "/Menubar/StatisticsMenu/IOGraphs", /* GUI path */ - "IO-Graphs", /* Name */ - WIRESHARK_STOCK_GRAPHS, /* stock_id */ - "_IO Graphs", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(gui_iostat_cb), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ - #else register_stat_menu_item_stock("_IO Graphs", REGISTER_STAT_GROUP_GENERIC, WIRESHARK_STOCK_GRAPHS, diff --git a/gtk/menus.c b/gtk/menus.c index 867231086b..790a32058c 100644 --- a/gtk/menus.c +++ b/gtk/menus.c @@ -99,6 +99,7 @@ #include "gtk/proto_help.h" #include "gtk/dissector_tables_dlg.h" #include "gtk/utf8_entities.h" +#include "gtk/expert_comp_dlg.h" #include "gtk/new_packet_list.h" @@ -1197,7 +1198,7 @@ static const char *ui_desc_menubar = " <menuitem name='FollowTCPStream' action='/Analyze/FollowTCPStream'/>\n" " <menuitem name='FollowUDPStream' action='/Analyze/FollowUDPStream'/>\n" " <menuitem name='FollowSSLStream' action='/Analyze/FollowSSLStream'/>\n" -" <placeholder name='ExpertInfoComposite'/>\n" +" <menuitem name='ExpertInfoComposite' action='/Analyze/ExpertInfoComposite'/>\n" " <menu name= 'ConversationFilterMenu' action='/Analyze/ConversationFilter'>\n" " <placeholder name='Filters'/>\n" " </menu>\n" @@ -1207,13 +1208,38 @@ static const char *ui_desc_menubar = " <menuitem name='ProtocolHierarchy' action='/Statistics/ProtocolHierarchy'/>\n" " <menuitem name='Conversations' action='/Statistics/Conversations'/>\n" " <menuitem name='Endpoints' action='/Statistics/Endpoints'/>\n" -" <placeholder name='IOGraphs'/>\n" +" <menuitem name='IOGraphs' action='/Statistics/IOGraphs'/>\n" " <separator/>\n" " <menu name= 'ConversationListMenu' action='/Analyze/ConversationList'>\n" -" <placeholder name='List-item'/>\n" +" <menuitem name='Ethernet' action='/Analyze/ConversationList/Ethernet'/>\n" +" <menuitem name='FibreChannel' action='/Analyze/ConversationList/FibreChannel'/>\n" +" <menuitem name='FDDI' action='/Analyze/ConversationList/FDDI'/>\n" +" <menuitem name='IP' action='/Analyze/ConversationList/IP'/>\n" +" <menuitem name='IPv6' action='/Analyze/ConversationList/IPv6'/>\n" +" <menuitem name='JXTA' action='/Analyze/ConversationList/JXTA'/>\n" +" <menuitem name='NCP' action='/Analyze/ConversationList/NCP'/>\n" +" <menuitem name='RSVP' action='/Analyze/ConversationList/RSVP'/>\n" +" <menuitem name='SCTP' action='/Analyze/ConversationList/SCTP'/>\n" +" <menuitem name='TCPIP' action='/Analyze/ConversationList/TCPIP'/>\n" +" <menuitem name='TR' action='/Analyze/ConversationList/TR'/>\n" +" <menuitem name='UDPIP' action='/Analyze/ConversationList/UDPIP'/>\n" +" <menuitem name='USB' action='/Analyze/ConversationList/USB'/>\n" +" <menuitem name='WLAN' action='/Analyze/ConversationList/WLAN'/>\n" " </menu>\n" " <menu name= 'EndpointListMenu' action='/Analyze/EndpointList'>\n" -" <placeholder name='Endpoint-List-item'/>\n" +" <menuitem name='Ethernet' action='/Analyze/EndpointList/Ethernet'/>\n" +" <menuitem name='FibreChannel' action='/Analyze/EndpointList/FibreChannel'/>\n" +" <menuitem name='FDDI' action='/Analyze/EndpointList/FDDI'/>\n" +" <menuitem name='IP' action='/Analyze/EndpointList/IP'/>\n" +" <menuitem name='IPv6' action='/Analyze/EndpointList/IPv6'/>\n" +" <menuitem name='JXTA' action='/Analyze/EndpointList/JXTA'/>\n" +" <menuitem name='RSVP' action='/Analyze/EndpointList/RSVP'/>\n" +" <menuitem name='SCTP' action='/Analyze/ConversationList/SCTP'/>\n" +" <menuitem name='TCPIP' action='/Analyze/ConversationList/TCPIP'/>\n" +" <menuitem name='TR' action='/Analyze/ConversationList/TR'/>\n" +" <menuitem name='UDPIP' action='/Analyze/ConversationList/UDPIP'/>\n" +" <menuitem name='USB' action='/Analyze/ConversationList/USB'/>\n" +" <menuitem name='WLAN' action='/Analyze/ConversationList/WLAN'/>\n" " </menu>\n" " <menu name= 'ServiceResponseTimeMenu' action='/Analyze/ServiceResponseTime'>\n" " <placeholder name='SRT-List-item'/>\n" @@ -1223,16 +1249,16 @@ static const char *ui_desc_menubar = " <menu name= 'BACnetMenu' action='/Analyze/BACnet'>\n" " <placeholder name='BACnet-List-item'/>\n" " </menu>\n" -" <placeholder name='FlowGraph'/>\n" +" <menuitem name='FlowGraph' action='/Analyze/StatisticsMenu/FlowGraph'/>\n" " <menu name= 'HTTPMenu' action='/Analyze/HTTP'>\n" " <placeholder name='HTTP-List-item'/>\n" " </menu>\n" " </menu>\n" " <menu name= 'TelephonyMenu' action='/Telephony'>\n" " <menu name= 'IAX2menu' action='/Telephony/IAX2'>\n" -" <placeholder name='StreamAnalysis'/>\n" +" <menuitem name='StreamAnalysis' action='/Telephony/IAX2/StreamAnalysis'/>\n" " </menu>\n" -" <placeholder name='VoIPCalls'/>\n" +" <menuitem name='VoIPCalls' action='/Telephony/VoIPCalls'/>\n" " </menu>\n" " <menu name= 'ToolsMenu' action='/Tools'>\n" " <menuitem name='FirewallACLRules' action='/Tools/FirewallACLRules'/>\n" @@ -1552,19 +1578,59 @@ static const GtkActionEntry main_menu_bar_entries[] = { { "/Analyze/FollowUDPStream", NULL, "Follow UDP Stream", NULL, NULL, G_CALLBACK(follow_udp_stream_cb) }, { "/Analyze/FollowSSLStream", NULL, "Follow SSL Stream", NULL, NULL, G_CALLBACK(follow_ssl_stream_cb) }, + { "/Analyze/ExpertInfoComposite",WIRESHARK_STOCK_EXPERT_INFO, "Expert Info _Composite", NULL, NULL, G_CALLBACK(expert_comp_dlg_launch) }, + { "/Analyze/ConversationFilter", NULL, "Conversation Filter", NULL, NULL, NULL }, { "/Analyze/ConversationList", NULL, "_Conversation List", NULL, NULL, NULL }, - { "/Analyze/EndpointList", NULL, "_Endpoint List", NULL, NULL, NULL }, - { "/Analyze/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL }, - { "/Analyze/BACnet", NULL, "BACnet", NULL, NULL, NULL }, - { "/Analyze/HTTP", NULL, "HTTP", NULL, NULL, NULL }, + { "/Analyze/ConversationList/Ethernet", WIRESHARK_STOCK_CONVERSATIONS, "Ethernet", NULL, NULL, G_CALLBACK(eth_endpoints_cb) }, + { "/Analyze/ConversationList/FibreChannel", WIRESHARK_STOCK_CONVERSATIONS, "Fibre Channel", NULL, NULL, G_CALLBACK(fc_endpoints_cb) }, + { "/Analyze/ConversationList/FDDI", WIRESHARK_STOCK_CONVERSATIONS, "FDDI", NULL, NULL, G_CALLBACK(fddi_endpoints_cb) }, + { "/Analyze/ConversationList/IP", WIRESHARK_STOCK_CONVERSATIONS, "IPv4", NULL, NULL, G_CALLBACK(ip_endpoints_cb) }, + { "/Analyze/ConversationList/IPv6", WIRESHARK_STOCK_CONVERSATIONS, "IPv6", NULL, NULL, G_CALLBACK(ipv6_endpoints_cb) }, + { "/Analyze/ConversationList/IPX", WIRESHARK_STOCK_CONVERSATIONS, "IPX", NULL, NULL, G_CALLBACK(ipx_endpoints_cb) }, + { "/Analyze/ConversationList/JXTA", WIRESHARK_STOCK_CONVERSATIONS, "JXTA", NULL, NULL, G_CALLBACK(jxta_conversation_cb) }, + { "/Analyze/ConversationList/NCP", WIRESHARK_STOCK_CONVERSATIONS, "NCP", NULL, NULL, G_CALLBACK(ncp_endpoints_cb) }, + { "/Analyze/ConversationList/RSVP", WIRESHARK_STOCK_CONVERSATIONS, "RSVP", NULL, NULL, G_CALLBACK(rsvp_endpoints_cb) }, + { "/Analyze/ConversationList/SCTP", WIRESHARK_STOCK_CONVERSATIONS, "SCTP", NULL, NULL, G_CALLBACK(sctp_conversation_cb) }, + { "/Analyze/ConversationList/TCPIP", WIRESHARK_STOCK_CONVERSATIONS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(tcpip_conversation_cb) }, + { "/Analyze/ConversationList/TR", WIRESHARK_STOCK_CONVERSATIONS, "Token Ring", NULL, NULL, G_CALLBACK(tr_conversation_cb) }, + { "/Analyze/ConversationList/UDPIP", WIRESHARK_STOCK_CONVERSATIONS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(udpip_conversation_cb) }, + { "/Analyze/ConversationList/USB", WIRESHARK_STOCK_CONVERSATIONS, "USB", NULL, NULL, G_CALLBACK(usb_endpoints_cb) }, + { "/Analyze/ConversationList/WLAN", WIRESHARK_STOCK_CONVERSATIONS, "WLAN", NULL, NULL, G_CALLBACK(wlan_endpoints_cb) }, + + { "/Analyze/EndpointList", NULL, "_Endpoint List", NULL, NULL, NULL }, + { "/Analyze/EndpointList/Ethernet", WIRESHARK_STOCK_ENDPOINTS, "Ethernet", NULL, NULL, G_CALLBACK(gtk_eth_hostlist_cb) }, + { "/Analyze/EndpointList/FibreChannel", WIRESHARK_STOCK_ENDPOINTS, "Fibre Channel", NULL, NULL, G_CALLBACK(gtk_fc_hostlist_cb) }, + { "/Analyze/EndpointList/FDDI", WIRESHARK_STOCK_ENDPOINTS, "FDDI", NULL, NULL, G_CALLBACK(gtk_fddi_hostlist_cb) }, + { "/Analyze/EndpointList/IP", WIRESHARK_STOCK_ENDPOINTS, "IPv4", NULL, NULL, G_CALLBACK(gtk_ip_hostlist_cb) }, + { "/Analyze/EndpointList/IPv6", WIRESHARK_STOCK_ENDPOINTS, "IPv6", NULL, NULL, G_CALLBACK(gtk_ipv6_hostlist_cb) }, + { "/Analyze/EndpointList/IPX", WIRESHARK_STOCK_ENDPOINTS, "IPX", NULL, NULL, G_CALLBACK(gtk_ipx_hostlist_cb) }, + { "/Analyze/EndpointList/JXTA", WIRESHARK_STOCK_ENDPOINTS, "JXTA", NULL, NULL, G_CALLBACK(gtk_jxta_hostlist_cb) }, + { "/Analyze/EndpointList/NCP", WIRESHARK_STOCK_ENDPOINTS, "NCP", NULL, NULL, G_CALLBACK(gtk_ncp_hostlist_cb) }, + { "/Analyze/EndpointList/RSVP", WIRESHARK_STOCK_ENDPOINTS, "RSVP", NULL, NULL, G_CALLBACK(gtk_rsvp_hostlist_cb) }, + { "/Analyze/EndpointList/SCTP", WIRESHARK_STOCK_ENDPOINTS, "SCTP", NULL, NULL, G_CALLBACK(gtk_sctp_hostlist_cb) }, + { "/Analyze/EndpointList/TCPIP", WIRESHARK_STOCK_ENDPOINTS, "TCP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_tcpip_hostlist_cb) }, + { "/Analyze/EndpointList/TR", WIRESHARK_STOCK_ENDPOINTS, "Token Ring", NULL, NULL, G_CALLBACK(gtk_tr_hostlist_cb) }, + { "/Analyze/EndpointList/UDPIP", WIRESHARK_STOCK_ENDPOINTS, "UDP (IPv4 & IPv6)", NULL, NULL, G_CALLBACK(gtk_udpip_hostlist_cb) }, + { "/Analyze/EndpointList/USB", WIRESHARK_STOCK_ENDPOINTS, "USB", NULL, NULL, G_CALLBACK(gtk_usb_hostlist_cb) }, + { "/Analyze/EndpointList/WLAN", WIRESHARK_STOCK_ENDPOINTS, "WLAN", NULL, NULL, G_CALLBACK(gtk_wlan_hostlist_cb) }, + + { "/Analyze/ServiceResponseTime", NULL, "Service _Response Time", NULL, NULL, NULL }, + + { "/Analyze/BACnet", NULL, "BACnet", NULL, NULL, NULL }, + + { "/Analyze/StatisticsMenu/FlowGraph", WIRESHARK_STOCK_FLOW_GRAPH, "Flo_w Graph...", NULL, NULL, G_CALLBACK(flow_graph_launch) }, + { "/Analyze/HTTP", NULL, "HTTP", NULL, NULL, NULL }, - { "/Statistics/Summary", GTK_STOCK_PROPERTIES, "_Summary", NULL, NULL, G_CALLBACK(summary_open_cb) }, - { "/Statistics/ProtocolHierarchy", NULL, "_Protocol Hierarchy", NULL, NULL, G_CALLBACK(proto_hier_stats_cb) }, + { "/Statistics/Summary", GTK_STOCK_PROPERTIES, "_Summary", NULL, NULL, G_CALLBACK(summary_open_cb) }, + { "/Statistics/ProtocolHierarchy", NULL, "_Protocol Hierarchy", NULL, NULL, G_CALLBACK(proto_hier_stats_cb) }, { "/Statistics/Conversations", WIRESHARK_STOCK_CONVERSATIONS, "Conversations", NULL, NULL, G_CALLBACK(init_conversation_notebook_cb) }, - { "/Statistics/Endpoints", WIRESHARK_STOCK_ENDPOINTS, "Endpoints", NULL, NULL, G_CALLBACK(init_hostlist_notebook_cb) }, + { "/Statistics/Endpoints", WIRESHARK_STOCK_ENDPOINTS, "Endpoints", NULL, NULL, G_CALLBACK(init_hostlist_notebook_cb) }, + { "/Statistics/IOGraphs", WIRESHARK_STOCK_GRAPHS, "_IO Graph", NULL, NULL, G_CALLBACK(gui_iostat_cb) }, - { "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL }, + { "/Telephony/IAX2", NULL, "IA_X2", NULL, NULL, NULL }, + { "/Telephony/IAX2/StreamAnalysis", NULL, "Stream Analysis...", NULL, NULL, G_CALLBACK(iax2_analysis_cb) }, + { "/Telephony/VoIPCalls", WIRESHARK_STOCK_TELEPHONE, "_VoIP Calls", NULL, NULL, G_CALLBACK(voip_calls_launch) }, { "/Tools/FirewallACLRules", NULL, "Firewall ACL Rules", NULL, NULL, G_CALLBACK(firewall_rule_cb) }, @@ -4072,34 +4138,34 @@ static guint merge_tap_menus_layered(GList *node, gint group) { /* entry->callback = node_data->callback;*/ switch(group) { case(REGISTER_STAT_GROUP_UNSORTED): - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_STAT_GROUP_GENERIC): - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_STAT_GROUP_CONVERSATION_LIST): /*entry->item_type = "<StockItem>";*/ /*entry->extra_data = WIRESHARK_STOCK_CONVERSATIONS;*/ - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_STAT_GROUP_ENDPOINT_LIST): /*entry->item_type = "<StockItem>";*/ /*entry->extra_data = WIRESHARK_STOCK_ENDPOINTS;*/ - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_STAT_GROUP_RESPONSE_TIME): /*entry->item_type = "<StockItem>";*/ /*entry->extra_data = WIRESHARK_STOCK_TIME;*/ - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_STAT_GROUP_TELEPHONY): - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_ANALYZE_GROUP_UNSORTED): - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER): - add_menu_item(node_data); + /*add_menu_item(node_data);*/ break; case(REGISTER_TOOLS_GROUP_UNSORTED): break; diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index e18d9d5c53..443e235907 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -872,7 +872,7 @@ voip_calls_init_tap(const char *dummy _U_, void* userdata _U_) /****************************************************************************/ /* entry point when called via the GTK menu */ #ifdef MAIN_MENU_USE_UIMANAGER -static void +void voip_calls_launch(GtkAction *action _U_, gpointer user_data _U_) { voip_calls_init_tap("", NULL); @@ -891,19 +891,6 @@ register_tap_listener_voip_calls_dlg(void) { register_stat_cmd_arg("voip,calls", voip_calls_init_tap, NULL); #ifdef MAIN_MENU_USE_UIMANAGER - register_stat_menu_item_stock( - REGISTER_STAT_GROUP_TELEPHONY, /* Group */ - "/Menubar/TelephonyMenu/VoIPCalls", /* GUI path */ - "VoIP-Calls", /* Name */ - WIRESHARK_STOCK_TELEPHONE, /* stock_id */ - "_VoIP Calls", /* label */ - NULL, /* accelerator */ - NULL, /* tooltip */ - G_CALLBACK(voip_calls_launch), /* callback */ - TRUE, /* enabled */ - NULL, /* selected_packet_enabled */ - NULL, /* selected_tree_row_enabled */ - NULL); /* callback_data */ #else register_stat_menu_item_stock("_VoIP Calls", REGISTER_STAT_GROUP_TELEPHONY, WIRESHARK_STOCK_TELEPHONE, |