gtk+ r20291 - in branches/gtk-2-12: . gtk

[csaavedra svn gnome org]

Author: csaavedra
Date: Tue Jun  3 00:42:39 2008
New Revision: 20291
URL: http://svn.gnome.org/viewvc/gtk+?rev=20291&view=rev

Log:
2008-06-02  Claudio Saavedra  <csaavedra igalia com>

	Merge from trunk:

        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.



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtkaction.c

Modified: branches/gtk-2-12/gtk/gtkaction.c
==============================================================================
--- branches/gtk-2-12/gtk/gtkaction.c	(original)
+++ branches/gtk-2-12/gtk/gtkaction.c	Tue Jun  3 00:42:39 2008
@@ -921,7 +921,8 @@
 {
   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);