summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--gtk/gtkaction.c3
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2b3a5efd31..5b3a86c5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
2008-06-02 Yevgen Muntyan <muntyan@tamu.edu>
Bug 535497 – Print preview doesn't work.
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);