diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2011-05-10 05:31:45 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2011-05-10 05:31:45 +0000 |
| commit | 8aa3a7b0acadc9fe50387830f3692c8e964b22b3 (patch) | |
| tree | 0a4afa0923cd2c2bf6bb17ac01ad9288e352b511 /gtk/conversations_tr.c | |
| parent | 40baaf4dbe6b792fb3f1c877b82446237f309c4b (diff) | |
More GUIManager stuff.
svn path=/trunk/; revision=37035
Diffstat (limited to 'gtk/conversations_tr.c')
| -rw-r--r-- | gtk/conversations_tr.c | 25 |
1 files changed, 8 insertions, 17 deletions
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); |