Fix so that you can set a new sort func.

Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
	so that you can set a new sort func.

diff --git a/ChangeLog b/ChangeLog
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 406bea472f0fd4a353d15750b5bfc0abd84861fa..c7391e87462ce1064e39ce1ea017cf75bec8600b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Sun Apr 28 22:43:55 2002  Jonathan Blandford  <jrb@gnome.org>
+
+       * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix
+       so that you can set a new sort func.
+
 2002-04-27  Anders Carlsson  <andersca@gnu.org>
 
        * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): 

diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index b0021415e530b2b04aac171f46404b5c471e6527..eb9b87e3fb3458867cf3d766ff35915c6b6c7c6a 100644 (file)
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1272,10 +1272,14 @@ gtk_tree_model_sort_set_sort_func (GtkTreeSortable        *sortable,
 
   for (list = tree_model_sort->sort_list; list; list = list->next)
     {
-      header = (GtkTreeDataSortHeader *) list->data;
+      GtkTreeDataSortHeader *list_header;
 
-      if (header->sort_column_id == sort_column_id)
-       break;
+      list_header = (GtkTreeDataSortHeader*) list->data;
+      if (list_header->sort_column_id == sort_column_id)
+       {
+         header = list_header;
+         break;
+       }
     }
 
   if (header == NULL)