osmith/wireshark
1
0
Fork 0
forked from osmocom/wireshark
Code Pull requests Releases Wiki Activity

More GUIManager stuff.

Browse source 
svn path=/trunk/; revision=36981
This commit is contained in:
Anders Broman 2011-05-03 20:23:57 +00:00
parent 8570de9708
commit b569f052d9
7 changed files with 126 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gtk/conversations_eth.c
View file

@ -43,7 +43,7 @@
#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)
@ -85,8 +85,24 @@ 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);
}

19
gtk/conversations_fc.c
View file

@ -44,6 +44,7 @@
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "gtk/stock_icons.h"
static int
@ -86,8 +87,24 @@ 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);
#endif
register_conversation_table(TRUE, "Fibre Channel", "fc", NULL /*filter*/, fc_conversation_packet);
}

20
gtk/conversations_fddi.c
View file

@ -42,7 +42,7 @@
#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)
@ -84,8 +84,24 @@ 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);
#endif
register_conversation_table(TRUE, "FDDI", "fddi", NULL /*filter*/, fddi_conversation_packet);
}

18
gtk/conversations_ip.c
View file

@ -42,7 +42,7 @@
#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)
@ -82,8 +82,24 @@ 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);
#endif
register_conversation_table(TRUE, "IPv4", "ip", NULL /*filter*/, ip_conversation_packet);
}

21
gtk/conversations_ipv6.c
View file

@ -42,7 +42,7 @@
#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)
@ -91,8 +91,25 @@ register_tap_listener_ipv6_conversation(void)
{
register_stat_cmd_arg("conv,ipv6", ipv6_conversation_init, NULL);
register_stat_menu_item("IPv6", REGISTER_STAT_GROUP_CONVERSATION_LIST,
#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);
#endif
register_conversation_table(TRUE, "IPv6", "ipv6", NULL /*filter*/, ipv6_conversation_packet);
}

18
gtk/conversations_ipx.c
View file

@ -42,6 +42,7 @@
#include "gtk/gui_stat_menu.h"
#include "gtk/conversations_table.h"
#include "gtk/stock_icons.h"
static int
@ -84,8 +85,25 @@ 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);
#endif
register_conversation_table(TRUE, "IPX", "ipx", NULL /*filter*/, ipx_conversation_packet);
}

20
gtk/conversations_jxta.c
View file

@ -43,7 +43,7 @@
#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)
@ -93,8 +93,24 @@ 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);
#endif
register_conversation_table(TRUE, "JXTA", "jxta", NULL /*filter*/, jxta_conversation_packet);
}