diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/bookmarks/ephy-bookmark-action.c | 19 |
2 files changed, 18 insertions, 8 deletions
@@ -1,5 +1,12 @@ 2004-07-01 Marco Pesenti Gritti <marco@gnome.org> + * src/bookmarks/ephy-bookmark-action.c: + (ephy_bookmark_action_sync_icon): + + No need to show the default icon for bookmarks menu. + +2004-07-01 Marco Pesenti Gritti <marco@gnome.org> + * src/bookmarks/ephy-bookmark-action.c: (create_tool_item), (favicon_cache_changed_cb), (ephy_bookmark_action_sync_icon), (stop_drag_check), (drag_data_get_cb), (drag_data_delete_cb), diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c index bea4cd18d..3921d4fcf 100644 --- a/src/bookmarks/ephy-bookmark-action.c +++ b/src/bookmarks/ephy-bookmark-action.c @@ -215,12 +215,6 @@ ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget } } - if (pixbuf == NULL) - { - pixbuf = gtk_widget_render_icon (proxy, GTK_STOCK_JUMP_TO, - GTK_ICON_SIZE_MENU, NULL); - } - if (GTK_IS_TOOL_ITEM (proxy)) { GtkImage *icon; @@ -228,9 +222,15 @@ ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget icon = GTK_IMAGE (g_object_get_data (G_OBJECT (proxy), "icon")); g_return_if_fail (icon != NULL); + if (pixbuf == NULL) + { + pixbuf = gtk_widget_render_icon (proxy, GTK_STOCK_JUMP_TO, + GTK_ICON_SIZE_MENU, NULL); + } + gtk_image_set_from_pixbuf (icon, pixbuf); } - else if (GTK_IS_MENU_ITEM (proxy)) + else if (GTK_IS_MENU_ITEM (proxy) && pixbuf) { GtkWidget *image; @@ -241,7 +241,10 @@ ephy_bookmark_action_sync_icon (GtkAction *action, GParamSpec *pspec, GtkWidget (GTK_IMAGE_MENU_ITEM (proxy), image); } - g_object_unref (pixbuf); + if (pixbuf) + { + g_object_unref (pixbuf); + } } static void |