From 9d000c0fd8036b64f1bea9fa9b993120d7b093cc Mon Sep 17 00:00:00 2001 From: Claudio Saavedra Date: Tue, 3 Jun 2008 00:31:10 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20535862=20=E2=80=93=20gtk=5Faction=5Fcreat?= =?UTF-8?q?e=5Ficon=20can't=20create=20icons=20from=20the=20icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-06-02 Claudio Saavedra 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 --- ChangeLog | 8 ++++++++ gtk/gtkaction.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2b3a5efd31..5b3a86c5c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-02 Claudio Saavedra + + 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 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);