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)
This commit is contained in:
Matthias Clasen 2005-11-28 15:42:00 +00:00 committed by Matthias Clasen
parent 4edf06d016
commit be2dc85cc1
3 changed files with 10 additions and 2 deletions

View File

@ -1,5 +1,9 @@
2005-11-28 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
handle the cell list and indices into it. (#321856) handle the cell list and indices into it. (#321856)

View File

@ -1,5 +1,9 @@
2005-11-28 Matthias Clasen <mclasen@redhat.com> 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 * gtk/gtkiconview.c (update_text_cell, update_pixbuf_cell): Correctly
handle the cell list and indices into it. (#321856) handle the cell list and indices into it. (#321856)

View File

@ -745,7 +745,7 @@ gtk_action_sync_button_stock_id (GtkAction *action,
GtkWidget *proxy) GtkWidget *proxy)
{ {
g_object_set (G_OBJECT (proxy), g_object_set (G_OBJECT (proxy),
"stock-id", "label",
action->private_data->stock_id, action->private_data->stock_id,
NULL); NULL);
} }
@ -948,7 +948,7 @@ connect_proxy (GtkAction *action,
{ {
/* synchronise stock-id */ /* synchronise stock-id */
g_object_set (proxy, g_object_set (proxy,
"stock-id", action->private_data->stock_id, "label", action->private_data->stock_id,
NULL); NULL);
g_signal_connect_object (action, "notify::stock-id", g_signal_connect_object (action, "notify::stock-id",
G_CALLBACK (gtk_action_sync_button_stock_id), G_CALLBACK (gtk_action_sync_button_stock_id),