From c00349046a0a5b73d5f778614caea493f44d120d Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Thu, 18 Oct 2001 18:39:36 +0000 Subject: [PATCH] fix small bug reported by (Oleg Maiboroda), #62600 Thu Oct 18 14:22:10 2001 Jonathan Blandford * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug reported by (Oleg Maiboroda), #62600 --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreestore.c | 6 ++++-- 8 files changed, 39 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index a4ac3b7525..cf970ad3dd 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Thu Oct 18 14:22:10 2001 Jonathan Blandford + + * gtk/gtktreestore.c (gtk_tree_store_remove): fix small bug + reported by (Oleg Maiboroda), #62600 + 2001-10-18 Michael Meeks * gtk/gtkentry.c (gtk_entry_set_property), diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c index 7a0aabc883..024859f9a3 100644 --- a/gtk/gtktreestore.c +++ b/gtk/gtktreestore.c @@ -941,7 +941,8 @@ gtk_tree_store_set (GtkTreeStore *tree_store, * @iter: A valid #GtkTreeIter * * Removes @iter from @tree_store. After being removed, @iter is set to the - * next valid row at that level, or invalidated if it previeously pointed to the last one. + * next valid row at that level, or invalidated if it previeously pointed to the + * last one. **/ void gtk_tree_store_remove (GtkTreeStore *tree_store, @@ -958,7 +959,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, parent = G_NODE (iter->user_data)->parent; g_assert (parent != NULL); - next_node = G_NODE (iter->user_data); + next_node = G_NODE (iter->user_data)->next; if (G_NODE (iter->user_data)->data) _gtk_tree_data_list_free ((GtkTreeDataList *) G_NODE (iter->user_data)->data, @@ -992,6 +993,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store, else { iter->stamp = 0; + iter->user_data = NULL; } }