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)
This commit is contained in:
parent
8afec72c8d
commit
13dcd62e23
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -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>
|
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/gtkrbtree.c (_gtk_rbtree_remove): include missing #ifdef G_ENABLE_DEBUG
|
||||||
|
@ -2042,6 +2042,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
|
|||||||
prev->next = next;
|
prev->next = next;
|
||||||
else
|
else
|
||||||
node->parent->children = next;
|
node->parent->children = next;
|
||||||
|
|
||||||
if (next)
|
if (next)
|
||||||
next->prev = prev;
|
next->prev = prev;
|
||||||
|
|
||||||
@ -2086,6 +2087,7 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
G_NODE (iter->user_data)->next = G_NODE (iter->user_data)->parent->children;
|
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);
|
G_NODE (iter->user_data)->parent->children = G_NODE (iter->user_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user