aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarco Pesenti Gritti <marco@gnome.org>2004-07-01 17:40:23 +0800
committerMarco Pesenti Gritti <marco@src.gnome.org>2004-07-01 17:40:23 +0800
commitdc18cc6b2040bfdf629a671bc8718030cb37260e (patch)
treefb4d4a7406042776bf4a0a1db2e214fda9d45ce1 /src
parent582199edf5b76697fba83ade64eddcf1349224cf (diff)
downloadgsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar.gz
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar.bz2
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar.lz
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar.xz
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.tar.zst
gsoc2013-epiphany-dc18cc6b2040bfdf629a671bc8718030cb37260e.zip
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: (ephy_bookmark_action_sync_icon): No need to show the default icon for bookmarks menu.
Diffstat (limited to 'src')
-rw-r--r--src/bookmarks/ephy-bookmark-action.c19
1 files changed, 11 insertions, 8 deletions
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