debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Create proxy menus without accels properly

Browse source 
Actually attempting to imitate Gtk's logic for
creating menu items from actions was silly. It
even had a rather obvious bug, no signals
were ever connected.

Now we leave all the work except for creating
an empty image menu item to Gtk. And it
works better than before.
This commit is contained in:
Christian Dywan 2008-08-15 02:58:09 +02:00
parent 6ab8bd6fd8
commit 48885bf9ae
1 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
midori/sokoke.c
View file

@ -609,7 +609,7 @@ sokoke_object_get_boolean (gpointer object,
* sokoke_action_create_popup_menu_item: * sokoke_action_create_popup_menu_item:
* @action: a #GtkAction * @action: a #GtkAction
* *
* Creates a menu item from an action, much like * Creates a menu item from an action, just like
* gtk_action_create_menu_item() but it won't * gtk_action_create_menu_item() but it won't
* display an accelerator. * display an accelerator.
* *
@ -618,32 +618,10 @@ sokoke_object_get_boolean (gpointer object,
GtkWidget* GtkWidget*
sokoke_action_create_popup_menu_item (GtkAction* action) sokoke_action_create_popup_menu_item (GtkAction* action)
{ {
gchar* label;
gchar* stock_id;
gboolean sensitive;
GtkStockItem stockitem;
GtkWidget* menuitem; GtkWidget* menuitem;
GtkWidget* image;
g_object_get (action, "label", &label, menuitem = gtk_image_menu_item_new_with_mnemonic ("");
"stock-id", &stock_id, "sensitive", &sensitive, NULL); gtk_action_connect_proxy (action, menuitem);
if (label)
{
menuitem = gtk_image_menu_item_new_with_mnemonic (label);
g_free (label);
}
else
{
gtk_stock_lookup (stock_id, &stockitem);
menuitem = gtk_image_menu_item_new_with_mnemonic (stockitem.label);
gtk_stock_item_free (&stockitem);
}
gtk_widget_set_sensitive (menuitem, sensitive);
image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
gtk_widget_show (menuitem);
g_free (stock_id);
return menuitem; return menuitem;
} }