Don't let the priv->image pointer dangle. (#136259, Padraig O'Briain)

Fri Mar  5 22:37:15 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
	the priv->image pointer dangle.  (#136259, Padraig O'Briain)
This commit is contained in:
Matthias Clasen
2004-03-05 21:36:03 +00:00
committed by Matthias Clasen
parent 9958ce70c5
commit 20cafaeefc
6 changed files with 30 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
Fri Mar 5 22:37:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
the priv->image pointer dangle. (#136259, Padraig O'Briain)
2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

View File

@@ -1,3 +1,8 @@
Fri Mar 5 22:37:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
the priv->image pointer dangle. (#136259, Padraig O'Briain)
2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

View File

@@ -1,3 +1,8 @@
Fri Mar 5 22:37:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
the priv->image pointer dangle. (#136259, Padraig O'Briain)
2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

View File

@@ -1,3 +1,8 @@
Fri Mar 5 22:37:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
the priv->image pointer dangle. (#136259, Padraig O'Briain)
2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

View File

@@ -1,3 +1,8 @@
Fri Mar 5 22:37:15 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkbutton.c (gtk_button_construct_child): Don't let
the priv->image pointer dangle. (#136259, Padraig O'Briain)
2004-03-05 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add

View File

@@ -586,8 +586,11 @@ gtk_button_construct_child (GtkButton *button)
return;
if (GTK_BIN (button)->child)
gtk_container_remove (GTK_CONTAINER (button),
GTK_BIN (button)->child);
{
gtk_container_remove (GTK_CONTAINER (button),
GTK_BIN (button)->child);
priv->image = NULL;
}
if (button->use_stock &&
gtk_stock_lookup (button->label_text, &item))