Don't leave priv->image dangling when use-stock is set to FALSE. (#437281,
2007-07-03 Matthias Clasen <mclasen@redhat.com> * 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
This commit is contained in:
committed by
Matthias Clasen
parent
2788ddf781
commit
65bb50f470
@@ -1,3 +1,9 @@
|
||||
2007-07-03 Matthias Clasen <mclasen@redhat.com>
|
||||
|
||||
* 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 <mclasen@redhat.com>
|
||||
|
||||
Merge from trunk:
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user