diff options
| author | Christian Dywan <christian@twotoasts.de> | 2012-12-16 19:40:00 +0100 |
|---|---|---|
| committer | Christian Dywan <christian@twotoasts.de> | 2012-12-16 19:40:00 +0100 |
| commit | f02f6d2160c6e00611e6ef0492e28f5b23b1ddd3 (patch) | |
| tree | 6fff208df9d608943838660ddeab532534352fd9 /katze/katze-arrayaction.c | |
| parent | 83be4c496eb765c4e19b9fd06b45ae92855ded77 (diff) | |
| download | midori-f02f6d2160c6e00611e6ef0492e28f5b23b1ddd3.tar.gz | |
Pass proxy widget to katze_item_get_image
Diffstat (limited to 'katze/katze-arrayaction.c')
| -rw-r--r-- | katze/katze-arrayaction.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/katze/katze-arrayaction.c b/katze/katze-arrayaction.c index 6b196599..9936134c 100644 --- a/katze/katze-arrayaction.c +++ b/katze/katze-arrayaction.c @@ -390,7 +390,7 @@ katze_array_action_generate_menu (KatzeArrayAction* array_action, } menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - image = katze_item_get_image (item); + image = katze_item_get_image (item, menuitem); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); @@ -590,14 +590,12 @@ katze_array_action_item_notify_cb (KatzeItem* item, } else if (KATZE_ITEM_IS_BOOKMARK (item) && !strcmp (property, "uri")) { - image = katze_item_get_image (item); - gtk_widget_show (image); + image = katze_item_get_image (item, GTK_WIDGET (toolitem)); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } else if (!strcmp (property, "icon")) { - image = katze_item_get_image (item); - gtk_widget_show (image); + image = katze_item_get_image (item, GTK_WIDGET (toolitem)); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); } } @@ -613,7 +611,7 @@ katze_array_action_proxy_create_menu_proxy_cb (GtkWidget* proxy, array_action = g_object_get_data (G_OBJECT (proxy), "KatzeArrayAction"); menuitem = katze_image_menu_item_new_ellipsized ( katze_item_get_name (item)); - image = katze_item_get_image (item); + image = katze_item_get_image (item, menuitem); gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image); gtk_image_menu_item_set_always_show_image ( GTK_IMAGE_MENU_ITEM (menuitem), TRUE); @@ -685,8 +683,7 @@ katze_array_action_create_tool_item_for (KatzeArrayAction* array_action, toolitem = gtk_tool_button_new (NULL, ""); g_signal_connect (toolitem, "create-menu-proxy", G_CALLBACK (katze_array_action_proxy_create_menu_proxy_cb), item); - image = katze_item_get_image (item); - gtk_widget_show (image); + image = katze_item_get_image (item, GTK_WIDGET (toolitem)); gtk_tool_button_set_icon_widget (GTK_TOOL_BUTTON (toolitem), image); label = gtk_label_new (NULL); /* FIXME: Should text direction be respected here? */ |