summaryrefslogtreecommitdiff
path: root/gtk/gtkaction.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2005-09-05 18:44:29 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-09-05 18:44:29 +0000
commit072775daaa76bde2f9c6bbdce09d35bb81269add (patch)
treeafddc162214b0764d141c86d6446fbd039044654 /gtk/gtkaction.c
parentaf1cd41b65b739bb9d17e7d517f5fcf3e99a6a40 (diff)
downloadgtk+-072775daaa76bde2f9c6bbdce09d35bb81269add.tar.gz
Set the label of a button if it has no child. (#315253, John Finlay)
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)
Diffstat (limited to 'gtk/gtkaction.c')
-rw-r--r--gtk/gtkaction.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkaction.c b/gtk/gtkaction.c
index d462c8c024..06e229c8e2 100644
--- a/gtk/gtkaction.c
+++ b/gtk/gtkaction.c
@@ -955,7 +955,8 @@ connect_proxy (GtkAction *action,
G_CALLBACK (gtk_action_sync_button_stock_id),
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 */
g_object_set (proxy,