aboutsummaryrefslogtreecommitdiffstats
path: root/gtk/conversations_tr.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2011-05-03 22:09:18 +0000
committerAnders Broman <anders.broman@ericsson.com>2011-05-03 22:09:18 +0000
commitaac86cad85a86ffbc0cf1769fe7b484832626e5f (patch)
treeedc1ae2fd0264fcfaf8f34ef52df7eb7f8db9d48 /gtk/conversations_tr.c
parentb569f052d92067d165e6d3eefd342574eb686f05 (diff)
More GUIManager stuff.
svn path=/trunk/; revision=36982
Diffstat (limited to 'gtk/conversations_tr.c')
-rw-r--r--gtk/conversations_tr.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/gtk/conversations_tr.c b/gtk/conversations_tr.c
index 208d67255f..ceb6e729f0 100644
--- a/gtk/conversations_tr.c
+++ b/gtk/conversations_tr.c
@@ -42,7 +42,7 @@
#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)
@@ -84,8 +84,24 @@ 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);
-
+#endif
register_conversation_table(TRUE, "Token Ring", "tr", NULL /*filter*/, tr_conversation_packet);
}