convert the iter to a child iter again, after doing _iter_children. It's

Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>

        * 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.

diff --git a/ChangeLog b/ChangeLog
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index edf2f3d7c3c97674574c9253e92fb3a071e88629..f00169ecfc5f99cc43fc5119d9cbd73281ba0c4f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Feb  9 22:57:43 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktextchild.c: Use == rather than = in sanity

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index e9fe1724623872fe41f11135c6acb7567821dfac..9808214ab1ea88c2562c556aaf796abc803aabc3 100644 (file)
--- 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);
     }