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

Set the label of a button if it has no child. (#315253, John Finlay)

Browse Source 
2005-09-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkaction.c (connect_proxy): Set the label of a button
	if it has no child.  (#315253, John Finlay)
This commit is contained in:
Matthias Clasen
2005-09-05 18:44:29 +00:00
committed by Matthias Clasen
parent af1cd41b65
commit 072775daaa
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy): Set the label of a button
if it has no child. (#315253, John Finlay)
2005-09-02 Matthias Clasen <mclasen@redhat.com> 2005-09-02 Matthias Clasen <mclasen@redhat.com>
* gtkimcontextsimple.h: Add a modifiers_dropped bit * gtkimcontextsimple.h: Add a modifiers_dropped bit

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2005-09-05 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkaction.c (connect_proxy): Set the label of a button
if it has no child. (#315253, John Finlay)
2005-09-02 Matthias Clasen <mclasen@redhat.com> 2005-09-02 Matthias Clasen <mclasen@redhat.com>
* gtkimcontextsimple.h: Add a modifiers_dropped bit * gtkimcontextsimple.h: Add a modifiers_dropped bit

3
gtk/gtkaction.c
View File

@ -955,7 +955,8 @@ connect_proxy (GtkAction *action,
G_CALLBACK (gtk_action_sync_button_stock_id), G_CALLBACK (gtk_action_sync_button_stock_id),
proxy, 0); proxy, 0);
} }
else if (GTK_IS_LABEL(GTK_BIN(proxy)->child)) else if (GTK_BIN (proxy)->child == NULL ||
GTK_IS_LABEL (GTK_BIN (proxy)->child))
{ {
/* synchronise the label */ /* synchronise the label */
g_object_set (proxy, g_object_set (proxy,