From ed42eb8fa68e606090dd736f3c97e908197af522 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 16 Nov 2003 20:53:07 +0000 Subject: [PATCH] just call gtk_cell_view_cell_layout_clear instead of trying to free the Sun Nov 16 21:48:40 2003 Kristian Rietveld * gtk/gtkcellview.c (gtk_cell_view_finalize): just call gtk_cell_view_cell_layout_clear instead of trying to free the structure ourselves here. (#125726, Morten Welinder). --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkcellview.c | 7 +------ 6 files changed, 31 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5d5ea9b40..53a5e0ab4f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Nov 16 21:48:40 2003 Kristian Rietveld + + * gtk/gtkcellview.c (gtk_cell_view_finalize): just call + gtk_cell_view_cell_layout_clear instead of trying to free the + structure ourselves here. (#125726, Morten Welinder). + Sun Nov 16 00:35:29 2003 Matthias Clasen * gtk/gtkfilechooser.[hc]: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index d5d5ea9b40..53a5e0ab4f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sun Nov 16 21:48:40 2003 Kristian Rietveld + + * gtk/gtkcellview.c (gtk_cell_view_finalize): just call + gtk_cell_view_cell_layout_clear instead of trying to free the + structure ourselves here. (#125726, Morten Welinder). + Sun Nov 16 00:35:29 2003 Matthias Clasen * gtk/gtkfilechooser.[hc]: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index d5d5ea9b40..53a5e0ab4f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sun Nov 16 21:48:40 2003 Kristian Rietveld + + * gtk/gtkcellview.c (gtk_cell_view_finalize): just call + gtk_cell_view_cell_layout_clear instead of trying to free the + structure ourselves here. (#125726, Morten Welinder). + Sun Nov 16 00:35:29 2003 Matthias Clasen * gtk/gtkfilechooser.[hc]: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index d5d5ea9b40..53a5e0ab4f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sun Nov 16 21:48:40 2003 Kristian Rietveld + + * gtk/gtkcellview.c (gtk_cell_view_finalize): just call + gtk_cell_view_cell_layout_clear instead of trying to free the + structure ourselves here. (#125726, Morten Welinder). + Sun Nov 16 00:35:29 2003 Matthias Clasen * gtk/gtkfilechooser.[hc]: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index d5d5ea9b40..53a5e0ab4f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sun Nov 16 21:48:40 2003 Kristian Rietveld + + * gtk/gtkcellview.c (gtk_cell_view_finalize): just call + gtk_cell_view_cell_layout_clear instead of trying to free the + structure ourselves here. (#125726, Morten Welinder). + Sun Nov 16 00:35:29 2003 Matthias Clasen * gtk/gtkfilechooser.[hc]: diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index f8ffa926cf..1dd8ff6447 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -289,12 +289,7 @@ gtk_cell_view_finalize (GObject *object) { GtkCellView *cellview = GTK_CELL_VIEW (object); - if (cellview->priv->cell_list) - { - g_list_foreach (cellview->priv->cell_list, (GFunc)g_free, NULL); - g_list_free (cellview->priv->cell_list); - } - cellview->priv->cell_list = NULL; + gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (object)); if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object);