From eaadb3ad62ea4c2772b8ce1bfa85a09e5905a1bb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 22 Jul 2004 02:26:07 +0000 Subject: [PATCH] Don't leak tree model and tree row reference. (#148125, Crispin Flowerday) Wed Jul 21 22:24:10 2004 Matthias Clasen * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak tree model and tree row reference. (#148125, Crispin Flowerday) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkcellview.c | 10 +++++++++- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8d7d291ba5..02551cd49a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jul 21 22:24:10 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak + tree model and tree row reference. (#148125, Crispin Flowerday) + Wed Jul 21 22:17:06 2004 Matthias Clasen * tests/testcombo.c (main): Don't leak models. (#148128, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8d7d291ba5..02551cd49a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Wed Jul 21 22:24:10 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak + tree model and tree row reference. (#148125, Crispin Flowerday) + Wed Jul 21 22:17:06 2004 Matthias Clasen * tests/testcombo.c (main): Don't leak models. (#148128, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8d7d291ba5..02551cd49a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Wed Jul 21 22:24:10 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak + tree model and tree row reference. (#148125, Crispin Flowerday) + Wed Jul 21 22:17:06 2004 Matthias Clasen * tests/testcombo.c (main): Don't leak models. (#148128, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8d7d291ba5..02551cd49a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Wed Jul 21 22:24:10 2004 Matthias Clasen + + * gtk/gtkcellview.c (gtk_cell_view_finalize): Don't leak + tree model and tree row reference. (#148125, Crispin Flowerday) + Wed Jul 21 22:17:06 2004 Matthias Clasen * tests/testcombo.c (main): Don't leak models. (#148128, diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 14600a29c1..2771c893e6 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -293,7 +293,15 @@ gtk_cell_view_style_set (GtkWidget *widget, static void gtk_cell_view_finalize (GObject *object) { - gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (object)); + GtkCellView *cellview = GTK_CELL_VIEW (object); + + gtk_cell_view_cell_layout_clear (GTK_CELL_LAYOUT (cellview)); + + if (cellview->priv->model) + g_object_unref (cellview->priv->model); + + if (cellview->priv->displayed_row) + gtk_tree_row_reference_free (cellview->priv->displayed_row); if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object);