Merge from HEAD.

Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>

        Merge from HEAD.

        * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after            sorting.

diff --git a/ChangeLog b/ChangeLog
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c5b45617fe379fbd4ed07600c49217d9d71ec284..f449b79de645e1067cd45a23c7cdf9629fe40161 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Fri Jul  5 12:51:39 2002  Kristian Rietveld  <kris@gtk.org>
+
+       Merge from HEAD.
+
+       * gtk/gtkliststore.c (gtk_list_store_sort): also update ->tail after    
+       sorting.
+
 2002-07-02 Padraig O'Briain <padraig.obriain@sun.com>
 
        * gtk/gtksocket.c (gtk_socket_hierarchy_changed):

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index b029efbeaa744e8be8dbdfb7c137b56160e91c39..dac96f3df089dbf0aa1f6112e19cdc4c645fe68c 100644 (file)
--- 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);