From 1e40b8cb180ed58629b7a761eb3582bf52895afa Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sat, 9 Feb 2002 21:56:30 +0000 Subject: [PATCH] convert the iter to a child iter again, after doing _iter_children. It's Sat Feb 9 22:57:43 2002 Kristian Rietveld * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert the iter to a child iter again, after doing _iter_children. It's possible that _iter_children added some rows and updated the stamp. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtktreemodelsort.c | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index edf2f3d7c3..f00169ecfc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Sat Feb 9 22:57:43 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_build_level): convert + the iter to a child iter again, after doing _iter_children. It's + possible that _iter_children added some rows and updated the stamp. + 2002-02-09 Daniel Elstner * gtk/gtktextchild.c: Use == rather than = in sanity diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index e9fe172462..9808214ab1 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -2021,6 +2021,12 @@ gtk_tree_model_sort_build_level (GtkTreeModelSort *tree_model_sort, &iter, &child_parent_iter) == FALSE) return; + + /* stamp may have changed */ + gtk_tree_model_sort_convert_iter_to_child_iter (tree_model_sort, + &child_parent_iter, + &parent_iter); + length = gtk_tree_model_iter_n_children (tree_model_sort->child_model, &child_parent_iter); }