summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorClaudio Saavedra <csaavedra@igalia.com>2008-06-03 00:31:10 +0000
committerClaudio Saavedra <csaavedra@src.gnome.org>2008-06-03 00:31:10 +0000
commit9d000c0fd8036b64f1bea9fa9b993120d7b093cc (patch)
tree8003cfc7f6f7186a9057a71797e800fdd694efeb /gtk
parentcb823b805af99e2ed0833a79536900c5a510c4c1 (diff)
downloadgtk+-9d000c0fd8036b64f1bea9fa9b993120d7b093cc.tar.gz
Bug 535862 – gtk_action_create_icon can't create icons from the icon
2008-06-02 Claudio Saavedra <csaavedra@igalia.com> Bug 535862 – gtk_action_create_icon can't create icons from the icon themes * gtk/gtkaction.c: (gtk_action_create_icon): Look for the icon in the default factories as it's supposed. svn path=/trunk/; revision=20290
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtkaction.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index 14485a6c03..22fb10812c 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -921,7 +921,8 @@ gtk_action_create_icon (GtkAction *action, GtkIconSize icon_size)
{
g_return_val_if_fail (GTK_IS_ACTION (action), NULL);
- if (action->private_data->stock_id)
+ if (action->private_data->stock_id &&
+ gtk_icon_factory_lookup_default (action->private_data->stock_id))
return gtk_image_new_from_stock (action->private_data->stock_id, icon_size);
else if (action->private_data->icon_name)
return gtk_image_new_from_icon_name (action->private_data->icon_name, icon_size);