Don't clear the model until we clean up all the other objects that might

Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
	the model until we clean up all the other objects
	that might refer to the object.

diff --git a/ChangeLog b/ChangeLog
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 30182b6ee5e6e76fba743b613b5e52940975094c..b2ae24354fa06c5ee8e5ed79e35bc230c1aa6b5e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jan 24 11:53:19 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktreeview.c (gtk_tree_view_destroy): Don't clear
+       the model until we clean up all the other objects
+       that might refer to the object.
+
 2002-01-24  Mark McLoughlin  <mark@skynet.ie>
 
        * gtk/gtkaccessible.h: include gtk/gtkwidget.h

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c5191de298afcfa37dcbcb1916d6eb4883a89a45..54447d58f514a9dbe339a08ad982984a9ba6783a 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1050,8 +1050,6 @@ gtk_tree_view_destroy (GtkObject *object)
       tree_view->priv->columns = NULL;
     }
 
-  gtk_tree_view_set_model (tree_view, NULL);
-
   if (tree_view->priv->tree != NULL)
     {
       gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
@@ -1059,12 +1057,6 @@ gtk_tree_view_destroy (GtkObject *object)
       tree_view->priv->tree = NULL;
     }
 
-  if (tree_view->priv->model != NULL)
-    {
-      g_object_unref (G_OBJECT (tree_view->priv->model));
-      tree_view->priv->model = NULL;
-    }
-
   if (tree_view->priv->selection != NULL)
     {
       _gtk_tree_selection_set_tree_view (tree_view->priv->selection, NULL);
@@ -1122,6 +1114,9 @@ gtk_tree_view_destroy (GtkObject *object)
       (* tree_view->priv->search_destroy) (tree_view->priv->search_user_data);
       tree_view->priv->search_user_data = NULL;
     }
+
+  gtk_tree_view_set_model (tree_view, NULL);
+
   if (GTK_OBJECT_CLASS (parent_class)->destroy)
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }