From 5a86c7f19ed3a527967d772ed0ef818702f4085e Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 30 Mar 2002 20:52:42 +0000 Subject: [PATCH] recommit after tagging 2_0_1 --- ChangeLog | 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/gtktreemodelsort.c | 3 +-- 7 files changed, 31 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index bdc1e8503..7544e3e23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bdc1e8503..7544e3e23 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bdc1e8503..7544e3e23 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bdc1e8503..7544e3e23 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bdc1e8503..7544e3e23 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bdc1e8503..7544e3e23 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sat Mar 30 15:19:24 2002 Kristian Rietveld + + * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, + as it broke stuff for trees + Fri Mar 29 18:15:12 2002 Owen Taylor * ===== Released 2.0.1 ====== diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 6b2a8cc30..186909075 100644 --- 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) { -- 2.43.2