From 65bb50f4701a72a3cf236eb2ce1bc6af9bafc38b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 3 Jul 2007 17:11:14 +0000 Subject: [PATCH] Don't leave priv->image dangling when use-stock is set to FALSE. (#437281, 2007-07-03 Matthias Clasen * gtk/gtkbutton.c (gtk_button_construct_child): Don't leave priv->image dangling when use-stock is set to FALSE. (#437281, Jochen Baier) svn path=/branches/gtk-2-10/; revision=18363 --- ChangeLog | 6 ++++++ gtk/gtkbutton.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea4ba0a720..6a1563869b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-03 Matthias Clasen + + * gtk/gtkbutton.c (gtk_button_construct_child): Don't leave + priv->image dangling when use-stock is set to FALSE. + (#437281, Jochen Baier) + 2007-06-29 Matthias Clasen Merge from trunk: diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index c45ac8eea4..11a0672d04 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -733,10 +733,10 @@ gtk_button_construct_child (GtkButton *button) image = g_object_ref (priv->image); if (image->parent) gtk_container_remove (GTK_CONTAINER (image->parent), image); - - priv->image = NULL; } + priv->image = NULL; + if (GTK_BIN (button)->child) gtk_container_remove (GTK_CONTAINER (button), GTK_BIN (button)->child);