From 6e32b590e1db6c81d8abe1f6ac08bafb04cb25e6 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 19 Mar 2006 10:37:21 +0000 Subject: [PATCH] 2006-03-19 [colin] 2.0.0cvs158 * src/addressbook.c and put groups at the top, always --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/addressbook.c | 6 ++++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab82f4b1d..1a46fdd0d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-03-19 [colin] 2.0.0cvs158 + + * src/addressbook.c + and put groups at the top, always + 2006-03-19 [colin] 2.0.0cvs157 * src/addressbook.c diff --git a/PATCHSETS b/PATCHSETS index 7221fde92..ddda6f6b8 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -1343,3 +1343,4 @@ ( cvs diff -u -r 1.60.2.50 -r 1.60.2.51 src/addressbook.c; ) > 2.0.0cvs155.patchset ( cvs diff -u -r 1.60.2.51 -r 1.60.2.52 src/addressbook.c; ) > 2.0.0cvs156.patchset ( cvs diff -u -r 1.60.2.52 -r 1.60.2.53 src/addressbook.c; ) > 2.0.0cvs157.patchset +( cvs diff -u -r 1.60.2.53 -r 1.60.2.54 src/addressbook.c; ) > 2.0.0cvs158.patchset diff --git a/configure.ac b/configure.ac index 8bab5c051..be21dba7f 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=0 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=157 +EXTRA_VERSION=158 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/addressbook.c b/src/addressbook.c index 60f2af4f1..9cc0077be 100644 --- a/src/addressbook.c +++ b/src/addressbook.c @@ -683,6 +683,7 @@ static void addressbook_size_allocate_cb(GtkWidget *widget, } static gint sort_column_number = 0; +static GtkSortType sort_column_type = GTK_SORT_ASCENDING; static gint list_case_sort( GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 ) @@ -704,9 +705,9 @@ static gint list_case_sort( } else { /* Order groups before person */ if( aio1->type == ITEMTYPE_GROUP ) { - return -1; + return (sort_column_type==GTK_SORT_ASCENDING) ? -1:+1; } else if( aio2->type == ITEMTYPE_GROUP ) { - return 1; + return (sort_column_type==GTK_SORT_ASCENDING) ? +1:-1; } return 0; } @@ -719,6 +720,7 @@ static void addressbook_sort_list(GtkCList *clist, const gint col, GtkWidget *hbox, *label, *arrow; sort_column_number = col; + sort_column_type = sort_type; gtk_clist_set_compare_func(clist, list_case_sort); gtk_clist_set_sort_type(clist, sort_type); gtk_clist_set_sort_column(clist, col); -- 2.25.1