diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-07-08 13:54:24 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-07-08 23:01:49 +0000 |
| commit | e312d418831c2f1cbb256584550b2c6ff765b7bc (patch) | |
| tree | 11493db07fb721036c766e02a864cfbc24e0e961 /ui/gtk/tap_param_dlg.c | |
| parent | 5c8b92c28b08d439b080232c2c686a11a15a5f39 (diff) | |
| download | wireshark-e312d418831c2f1cbb256584550b2c6ff765b7bc.tar.gz | |
GTK+: Add a Telephony/ANSI menu placeholder.
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add
recently updated stats.
Make sure we properly escape our path separators.
Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33
Reviewed-on: https://code.wireshark.org/review/9564
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/tap_param_dlg.c')
| -rw-r--r-- | ui/gtk/tap_param_dlg.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ui/gtk/tap_param_dlg.c b/ui/gtk/tap_param_dlg.c index cdb6a3bf08..baf2661902 100644 --- a/ui/gtk/tap_param_dlg.c +++ b/ui/gtk/tap_param_dlg.c @@ -62,15 +62,27 @@ void register_param_stat(tap_param_dlg *info, const char *name, register_stat_group_t group) { + gchar *action_name; gchar *full_name; const gchar *stock_id = NULL; stat_tap_ui ui_info; + size_t i; + /* XXX We appear to leak memory here. */ /* * This menu item will pop up a dialog box, so append "..." * to it. */ full_name = g_strdup_printf("%s...", name); + /* + * Escape path separators for add_menu_item_to_main_menubar. + */ + action_name = g_strdup(name); + for (i = 0; i < strlen(action_name); i++) { + if (action_name[i] == '/') { + action_name[i] = '#'; + } + } ui_info.group = group; ui_info.title = full_name; @@ -101,6 +113,7 @@ register_param_stat(tap_param_dlg *info, const char *name, break; case REGISTER_STAT_GROUP_TELEPHONY: + case REGISTER_STAT_GROUP_TELEPHONY_ANSI: case REGISTER_STAT_GROUP_TELEPHONY_GSM: case REGISTER_STAT_GROUP_TELEPHONY_LTE: case REGISTER_STAT_GROUP_TELEPHONY_SCTP: @@ -112,7 +125,7 @@ register_param_stat(tap_param_dlg *info, const char *name, register_menu_bar_menu_items( stat_group_name(group), /* GUI path to the place holder in the menu */ - name, /* Action name */ + action_name, /* Action name */ stock_id, /* Stock id */ full_name, /* label */ NULL, /* Accelerator */ |