callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for a stock icon, not a stock item, when deciding whether to use

Browse Source 
2006-03-16  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkactiongroup.c (gtk_action_group_add_actions_full)
	(gtk_action_group_add_toggle_actions_full)
	(gtk_action_group_add_radio_actions_full): Check for a stock
	icon, not a stock item, when deciding whether to use stock-id
	or icon-name.  (#334760, Jody Goldberg)
This commit is contained in:
Matthias Clasen
2006-03-16 15:38:55 +00:00
committed by Matthias Clasen
parent 53ac490322
commit e0d9da5a19
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,5 +1,11 @@
2006-03-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_add_actions_full)
(gtk_action_group_add_toggle_actions_full)
(gtk_action_group_add_radio_actions_full): Check for a stock
icon, not a stock item, when deciding whether to use stock-id
or icon-name. (#334760, Jody Goldberg)
* gtk/gtkimage.c (gtk_image_clear): Update the size of the image,
by swapping the implementations of gtk_image_clear and
gtk_image_reset. (#334657)

6
ChangeLog.pre-2-10
View File

@ -1,5 +1,11 @@
2006-03-16 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkactiongroup.c (gtk_action_group_add_actions_full)
(gtk_action_group_add_toggle_actions_full)
(gtk_action_group_add_radio_actions_full): Check for a stock
icon, not a stock item, when deciding whether to use stock-id
or icon-name. (#334760, Jody Goldberg)
* gtk/gtkimage.c (gtk_image_clear): Update the size of the image,
by swapping the implementations of gtk_image_clear and
gtk_image_reset. (#334657)

8
gtk/gtkactiongroup.c
View File

@ -781,9 +781,7 @@ gtk_action_group_add_actions_full (GtkActionGroup *action_group,
if (entries[i].stock_id)
{
GtkStockItem item;
if (gtk_stock_lookup (entries[i].stock_id, &item))
if (gtk_icon_factory_lookup_default (entries[i].stock_id))
g_object_set (action, "stock-id", entries[i].stock_id, NULL);
else
g_object_set (action, "icon-name", entries[i].stock_id, NULL);
@ -889,7 +887,7 @@ gtk_action_group_add_toggle_actions_full (GtkActionGroup *action_gro
{
GtkStockItem item;
if (gtk_stock_lookup (entries[i].stock_id, &item))
if (gtk_icon_factory_lookup_default (entries[i].stock_id))
g_object_set (action, "stock-id", entries[i].stock_id, NULL);
else
g_object_set (action, "icon-name", entries[i].stock_id, NULL);
@ -1004,7 +1002,7 @@ gtk_action_group_add_radio_actions_full (GtkActionGroup *action_group
{
GtkStockItem item;
if (gtk_stock_lookup (entries[i].stock_id, &item))
if (gtk_icon_factory_lookup_default (entries[i].stock_id))
g_object_set (action, "stock-id", entries[i].stock_id, NULL);
else
g_object_set (action, "icon-name", entries[i].stock_id, NULL);