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

Fix creation of menu actions in ws_menubar_create_action_group(). 

Action names are expected to begin with /, so prepend a /.

Fixes the "plugin" menu mechanism (which could be used by built-in code
as well, so it's not really a "plugin" menu mechanism).

Change-Id: Ic45412399078796359649cc876d2c8bfc9a790c6
Reviewed-on: https://code.wireshark.org/review/10046
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2015-08-15 10:49:51 -07:00
parent 88f334bc39
commit c222719a3b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/gtk/main_menubar.c
View File

@ -5461,6 +5461,7 @@ ws_menubar_create_action_group(ext_menu_t * menu, const char * xpath_parent, Gtk
ext_menubar_t * item = NULL;
GList * children = NULL;
GtkAction * menu_item;
gchar *action_name;
gchar * xpath, *submenu_xpath;
@ -5471,8 +5472,10 @@ ws_menubar_create_action_group(ext_menu_t * menu, const char * xpath_parent, Gtk
xpath = g_strconcat(xpath_parent, menu->name, NULL);
/* Create the action for the menu item and add it to the action group */
action_name = g_strconcat("/", menu->name, NULL);
menu_item = (GtkAction *)g_object_new ( GTK_TYPE_ACTION,
"name", menu->name, "label", menu->label, NULL );
"name", action_name, "label", menu->label, NULL );
g_free(action_name);
gtk_action_group_add_action(action_group, menu_item);
@ -5492,13 +5495,15 @@ ws_menubar_create_action_group(ext_menu_t * menu, const char * xpath_parent, Gtk
}
else if ( item->type != EXT_MENUBAR_SEPARATOR )
{
action_name = g_strconcat("/", item->name, NULL);
menu_item = (GtkAction*) g_object_new( GTK_TYPE_ACTION,
"name", item->name,
"name", action_name,
"label", item->label,
"tooltip", item->tooltip,
NULL);
g_signal_connect(menu_item, "activate", G_CALLBACK(ws_menubar_external_cb), item );
gtk_action_group_add_action(action_group, menu_item);
g_free(action_name);
}
children = g_list_next(children);