clean up selection when changing models.

Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
	when changing models.

8 files changed, 42 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c7f4606d7c..84eb13d4b0 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Aug 22 19:03:27 2001  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_set_model): clean up selection
+	when changing models.
+
 Wed Aug 22 18:25:46 2001  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtktreeview.c: Fix selection.  I think it's all dandy now.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 3a1bc0e8d2..674bc8f31b 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6201,11 +6201,13 @@ gtk_tree_view_set_model (GtkTreeView  *tree_view,
 	  _gtk_rbtree_free (tree_view->priv->tree);
 	  tree_view->priv->tree = NULL;
 	}
-      if (tree_view->priv->drag_dest_row)
-	{
-	  gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
-	  tree_view->priv->drag_dest_row = NULL;
-	}
+      gtk_tree_row_reference_free (tree_view->priv->drag_dest_row);
+      tree_view->priv->drag_dest_row = NULL;
+      gtk_tree_row_reference_free (tree_view->priv->cursor);
+      tree_view->priv->cursor = NULL;
+      gtk_tree_row_reference_free (tree_view->priv->anchor);
+      tree_view->priv->anchor = NULL;
+
       g_object_unref (tree_view->priv->model);
       tree_view->priv->search_column = -1;
     }