recommit after tagging 2_0_1

diff --git a/ChangeLog b/ChangeLog
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index bdc1e8503827f1fe9e640fd16b3d45d594966c77..7544e3e23133d173866039c61854f235735d29db 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sat Mar 30 15:19:24 2002  Kristian Rietveld  <kris@gtk.org>
+
+       * gtk/gtktreemodelsort.c: revert the latest stamp increment changes,
+       as it broke stuff for trees
+
 Fri Mar 29 18:15:12 2002  Owen Taylor  <otaylor@redhat.com>
 
        * ===== Released 2.0.1 ======

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index 6b2a8cc3086578103338a8c2195275c1a8eb6c96..1869090759bb25a926bfb4fb6ddc95633de39f0a 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -804,6 +804,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
 
       gtk_tree_model_sort_sort_level (tree_model_sort, level,
                                      FALSE, FALSE);
+      gtk_tree_model_sort_increment_stamp (tree_model_sort);
 
       if (gtk_tree_path_get_depth (path))
        {
@@ -1534,8 +1535,6 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort,
       gtk_tree_path_free (path);
     }
 
-  gtk_tree_model_sort_increment_stamp (tree_model_sort);
-
   /* recurse, if possible */
   if (recurse)
     {