Commit 3be3d84b authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Don't trigger warnings if there are extra references to the hbox.

2005-06-23  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkbutton.c (gtk_button_construct_child): Don't
	trigger warnings if there are extra references to the
	hbox.  (#308677, Dan Winship)
parent af1c6bb0
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
......
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
......
2005-06-23 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't
trigger warnings if there are extra references to the
hbox. (#308677, Dan Winship)
* gtk/gtkfilesystemunix.c (bookmark_list_write): Use
g_file_set_contents(). (#308722, Morten Welinder)
......
......@@ -687,7 +687,11 @@ gtk_button_construct_child (GtkButton *button)
if (GTK_BIN (button)->child)
{
if (priv->image && !priv->image_is_stock)
image = g_object_ref (priv->image);
{
image = g_object_ref (priv->image);
if (image->parent)
gtk_container_remove (GTK_CONTAINER (image->parent), image);
}
gtk_container_remove (GTK_CONTAINER (button),
GTK_BIN (button)->child);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment