From 1aefb1160590060e6a5afb1e41924ec1771d9b6e Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Sun, 10 Feb 2002 22:53:20 +0000 Subject: increase value of new_location by one if cmp_a > 0 and we hit the end of Sun Feb 10 22:20:46 2002 Kristian Rietveld * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase value of new_location by one if cmp_a > 0 and we hit the end of the list and pass NULL instead of a 'NULL-iter' with _rows_reordered --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkliststore.c | 5 ++++- 8 files changed, 53 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3a03a86448..014fddcb5f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun Feb 10 22:20:46 2002 Kristian Rietveld + + * gtk/gtkliststore.c (gtk_list_store_sort_iter_changed): increase + value of new_location by one if cmp_a > 0 and we hit the end of + the list and pass NULL instead of a 'NULL-iter' with + _rows_reordered + Sun Feb 10 12:32:44 2002 Owen Taylor * modules/input/Makefile.am modules/input/{imam-et.c, imti-er.c, diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index 829cfa939c..1c90037902 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1777,6 +1777,9 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, cmp_a = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data); } + if (!list->next && cmp_a > 0) + new_location++; + if ((!list->next) && (cmp_a > 0)) { list->next = G_SLIST (iter->user_data); @@ -1824,7 +1827,7 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store, tmp_iter.user_data = NULL; gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store), - tmp_path, &tmp_iter, + tmp_path, NULL, new_order); gtk_tree_path_free (tmp_path); -- cgit v1.2.1