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=/trunk/; revision=18362
+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-07-03 Tor Lillqvist <tml@novell.com>
* configure.in: Handle GDK_PIXBUF_EXTRA_LIBS like GDK_EXTRA_LIBS,
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);
-
+
if (button->use_stock &&
button->label_text &&
gtk_stock_lookup (button->label_text, &item))