Merged from gtk-2-0.

Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>

        Merged from gtk-2-0.

        * gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
        of the next node correctly, so we don't corrupt the list and cause
        bad things. (fixes #71374)

ChangeLog

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

ChangeLog.pre-2-10

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

ChangeLog.pre-2-2

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

ChangeLog.pre-2-4

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

ChangeLog.pre-2-6

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

ChangeLog.pre-2-8

+Thu May 16 23:59:56 2002  Kristian Rietveld  <kris@gtk.org>
+
+	Merged from gtk-2-0.
+
+	* gtk/gtktreestore.c (gtk_tree_store_sort_iter_changed): set the prev
+	of the next node correctly, so we don't corrupt the list and cause
+	bad things. (fixes #71374)
+ 
 Thu May 16 17:29:08 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG

gtk/gtktreestore.c

@@ -2042,6 +2042,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
     prev->next = next;
   else
     node->parent->children = next;
+
   if (next)
     next->prev = prev;
 
@@ -2086,6 +2087,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
   else
     {
       G_NODE (iter->user_data)->next = G_NODE (iter->user_data)->parent->children;
+      G_NODE (iter->user_data)->next->prev = G_NODE (iter->user_data);
       G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data);
     }