diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-05-24 03:10:56 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-05-24 03:10:56 +0000 |
| commit | 3598d9e2ac7582715d0af8a32b5ffccefeec98a9 (patch) | |
| tree | 9ae7974f944846b2e2ff5444abae9beb983973c3 /ui/gtk/funnel_stat.c | |
| parent | ba77e3c54d6aaf5617c76ffbcc2f4a6759b702bb (diff) | |
| download | wireshark-3598d9e2ac7582715d0af8a32b5ffccefeec98a9.tar.gz | |
Have register_param_stat() add menu items, rather than having the menu
items hardcoded into ui/gtk/main_menubar.c
Get rid of more stuff implying that the code for adding menu items is
used only by Lua, as it's also used by register_param_stat().
Add the items to the menu list sorted by the menu item name shown to the
user.
Get rid of some const declarations that are lies.
Use the label given for a menu item as the label in the menu, rather
than parsing it from a token.
svn path=/trunk/; revision=49552
Diffstat (limited to 'ui/gtk/funnel_stat.c')
| -rw-r--r-- | ui/gtk/funnel_stat.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index b245df78a6..4af421486b 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -596,23 +596,6 @@ static void our_menu_callback(void* unused _U_, gpointer data) { if (mcb->retap) cf_retap_packets(&cfile); } -static const char* stat_group_name(register_stat_group_t group) { - /* See make_menu_xml() for an explanation of the string format */ - static const value_string group_name_vals[] = { - {REGISTER_ANALYZE_GROUP_UNSORTED, "/Menubar/AnalyzeMenu|Analyze"}, /* unsorted analyze stuff */ - {REGISTER_ANALYZE_GROUP_CONVERSATION_FILTER, "/Menubar/AnalyzeMenu|Analyze/ConversationFilterMenu|Analyze#ConversationFilter"}, /* conversation filters */ - {REGISTER_STAT_GROUP_UNSORTED, "/Menubar/StatisticsMenu|Statistics"}, /* unsorted statistic function */ - {REGISTER_STAT_GROUP_GENERIC, "/Menubar/StatisticsMenu|Statistics"}, /* generic statistic function, not specific to a protocol */ - {REGISTER_STAT_GROUP_CONVERSATION_LIST, "/Menubar/StatisticsMenu|Statistics/ConversationListMenu|Statistics#ConversationList"}, /* member of the conversation list */ - {REGISTER_STAT_GROUP_ENDPOINT_LIST, "/Menubar/StatisticsMenu|Statistics/EndpointListMenu|Statistics#EndpointList"}, /* member of the endpoint list */ - {REGISTER_STAT_GROUP_RESPONSE_TIME, "/Menubar/StatisticsMenu|Statistics/ServiceResponseTimeMenu|Statistics#ServiceResponseTime"}, /* member of the service response time list */ - {REGISTER_STAT_GROUP_TELEPHONY, "/Menubar/TelephonyMenu|Telephony"}, /* telephony specific */ - {REGISTER_TOOLS_GROUP_UNSORTED, "/Menubar/ToolsMenu|Tools"}, /* unsorted tools */ - {0, NULL} - }; - return val_to_str_const(group, group_name_vals, "/Menubar/ToolsMenu|Tools"); -} - static void register_menu_cb(const char *name, register_stat_group_t group, void (*callback)(gpointer), |