From 13dcd62e2308e57c20fcda83ac04117793748081 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Thu, 16 May 2002 22:17:59 +0000 Subject: [PATCH] Merged from gtk-2-0. Thu May 16 23:59:56 2002 Kristian Rietveld 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 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ gtk/gtktreestore.c | 2 ++ 7 files changed, 50 insertions(+) diff --git a/ChangeLog b/ChangeLog index df0953a6a7..eafda3c023 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * 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 df0953a6a7..eafda3c023 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * 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 df0953a6a7..eafda3c023 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * 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 df0953a6a7..eafda3c023 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * 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 df0953a6a7..eafda3c023 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * 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 df0953a6a7..eafda3c023 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Thu May 16 23:59:56 2002 Kristian Rietveld + + 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 * gtk/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index b3cf3ed4d5..c1380f03e4 100644 --- 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); }