diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-11-28 15:40:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-11-28 15:40:08 +0000 |
| commit | bca63a5d339c4c2eafdd2f5dddaa010573b0f73e (patch) | |
| tree | ca9dfb7b4b250dbbdca406ec38c44df4a145e851 | |
| parent | 7207dfbc0b8b07ddb3321f7479412b4efe7013d5 (diff) | |
| download | gdk-pixbuf-bca63a5d339c4c2eafdd2f5dddaa010573b0f73e.tar.gz | |
Buttons use the label property for stock ids. (#322565, Milosz Derezynski)
2005-11-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (gtk_action_sync_button_stock_id)
(connect_proxy): Buttons use the label property for stock ids. (#322565,
Milosz Derezynski)
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | gtk/gtkaction.c | 4 |
3 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,9 @@ 2005-11-28 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaction.c (gtk_action_sync_button_stock_id) + (connect_proxy): Buttons use the label property for stock ids. (#322565, + Milosz Derezynski) + * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly handle the cell list and indices into it. (#321856) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbe363634..27338b516 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2005-11-28 Matthias Clasen <mclasen@redhat.com> + * gtk/gtkaction.c (gtk_action_sync_button_stock_id) + (connect_proxy): Buttons use the label property for stock ids. (#322565, + Milosz Derezynski) + * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly handle the cell list and indices into it. (#321856) diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c index fbb32a891..fc0871ab6 100644 --- a/gtk/gtkaction.c +++ b/gtk/gtkaction.c @@ -745,7 +745,7 @@ gtk_action_sync_button_stock_id (GtkAction *action, GtkWidget *proxy) { g_object_set (G_OBJECT (proxy), - "stock-id", + "label", action->private_data->stock_id, NULL); } @@ -949,7 +949,7 @@ connect_proxy (GtkAction *action, { /* synchronise stock-id */ g_object_set (proxy, - "stock-id", action->private_data->stock_id, + "label", action->private_data->stock_id, NULL); g_signal_connect_object (action, "notify::stock-id", G_CALLBACK (gtk_action_sync_button_stock_id), |