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)

diff --git a/ChangeLog b/ChangeLog
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+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

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index df0953a6a7abd26c0c30b6003b0aa1e84a2ee41f..eafda3c023b69eaca09bbdc4775c36cdba645460 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+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

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index b3cf3ed4d52b97cc1ee45a198277c0a6f4fd41d6..c1380f03e47e10dd9464ce443343b4e2e64f7dc8 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/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);
     }