From c9bd72a3bfcca6360361e16f58486374e44820e4 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Fri, 5 Jul 2002 10:44:36 +0000 Subject: [PATCH] Merge from HEAD. Fri Jul 5 12:51:39 2002 Kristian Rietveld Merge from HEAD. * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after sorting. --- ChangeLog | 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 | 1 + 7 files changed, 43 insertions(+) diff --git a/ChangeLog b/ChangeLog index c5b45617f..f449b79de 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c5b45617f..f449b79de 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c5b45617f..f449b79de 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c5b45617f..f449b79de 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c5b45617f..f449b79de 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c5b45617f..f449b79de 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Jul 5 12:51:39 2002 Kristian Rietveld + + Merge from HEAD. + + * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after + sorting. + 2002-07-02 Padraig O'Briain * gtk/gtksocket.c (gtk_socket_hierarchy_changed): diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c index b029efbea..dac96f3df 100644 --- a/gtk/gtkliststore.c +++ b/gtk/gtkliststore.c @@ -1684,6 +1684,7 @@ gtk_list_store_sort (GtkListStore *list_store) g_array_index (sort_array, SortTuple, i + 1).el; g_array_index (sort_array, SortTuple, list_store->length - 1).el->next = NULL; list_store->root = g_array_index (sort_array, SortTuple, 0).el; + list_store->tail = g_array_index (sort_array, SortTuple, list_store->length - 1).el; /* Let the world know about our new order */ new_order = g_new (gint, list_store->length); -- 2.43.2