diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2006-03-16 15:38:55 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-03-16 15:38:55 +0000 |
| commit | e0d9da5a1994cda70ce1d3224c8875ddc50ef1d7 (patch) | |
| tree | 79cd6386140dc0b897daee70183a104b16d350b9 | |
| parent | 53ac49032214684c58eb1693cbd2299b30318142 (diff) | |
| download | gdk-pixbuf-e0d9da5a1994cda70ce1d3224c8875ddc50ef1d7.tar.gz | |
Check for a stock icon, not a stock item, when deciding whether to use
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | gtk/gtkactiongroup.c | 8 |
3 files changed, 15 insertions, 5 deletions
@@ -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) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 268335059..6df12e07d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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) diff --git a/gtk/gtkactiongroup.c b/gtk/gtkactiongroup.c index a6a40446c..aa5adb5d7 100644 --- a/gtk/gtkactiongroup.c +++ b/gtk/gtkactiongroup.c @@ -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); |