From 20cafaeefcdfe301a27d2cf90fad7424620e22a2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 5 Mar 2004 21:36:03 +0000 Subject: [PATCH] Don't let the priv->image pointer dangle. (#136259, Padraig O'Briain) Fri Mar 5 22:37:15 2004 Matthias Clasen * gtk/gtkbutton.c (gtk_button_construct_child): Don't let the priv->image pointer dangle. (#136259, Padraig O'Briain) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkbutton.c | 7 +++++-- 6 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b79cdb36a8..37be98c5f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Mar 5 22:37:15 2004 Matthias Clasen + + * 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 * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b79cdb36a8..37be98c5f0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Mar 5 22:37:15 2004 Matthias Clasen + + * 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 * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b79cdb36a8..37be98c5f0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Mar 5 22:37:15 2004 Matthias Clasen + + * 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 * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b79cdb36a8..37be98c5f0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Mar 5 22:37:15 2004 Matthias Clasen + + * 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 * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b79cdb36a8..37be98c5f0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Mar 5 22:37:15 2004 Matthias Clasen + + * 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 * gtk/gtkfilechooserprivate.h (struct _GtkFileChooserIface): Add diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c index 6a0869068f..84ea2bb562 100644 --- a/gtk/gtkbutton.c +++ b/gtk/gtkbutton.c @@ -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))