From 207daec517ea5e5f4262cc5c0c62f067561bf3ab Mon Sep 17 00:00:00 2001 From: Jonathan Blandford Date: Mon, 29 Apr 2002 02:57:06 +0000 Subject: [PATCH] Fix so that you can set a new sort func. Sun Apr 28 22:43:55 2002 Jonathan Blandford * gtk/gtktreemodelsort.c (gtk_tree_model_sort_set_sort_func): Fix so that you can set a new sort func. --- 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 | 10 +++++++--- 7 files changed, 37 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 406bea472f..c7391e8746 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 406bea472f..c7391e8746 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 406bea472f..c7391e8746 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 406bea472f..c7391e8746 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 406bea472f..c7391e8746 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 406bea472f..c7391e8746 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Sun Apr 28 22:43:55 2002 Jonathan Blandford + + * 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 * gdk/x11/gdkpixmap-x11.c (gdk_pixmap_foreign_new_for_display): diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index b0021415e5..eb9b87e3fb 100644 --- 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)