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
This commit is contained in:
Claudio Saavedra 2008-06-03 00:31:10 +00:00 committed by Claudio Saavedra
parent cb823b805a
commit 9d000c0fd8
2 changed files with 10 additions and 1 deletions

View File

@ -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.

View File

@ -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);