2006-03-19 [colin] 2.0.0cvs158

	* src/addressbook.c
		and put groups at the top, always

diff --git a/ChangeLog b/ChangeLog
index ab82f4b1de770a690b88c4498ded8ef03d3dc195..1a46fdd0dd1f9dcfccab15373aefba742e36378d 100644 (file)
--- 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
 2006-03-19 [colin]     2.0.0cvs157
 
        * src/addressbook.c

diff --git a/PATCHSETS b/PATCHSETS
index 7221fde922ed008749c461e4dfbb83ab160e0e7d..ddda6f6b8217b13ab04c3b3c7943ce5d31630f5d 100644 (file)
--- 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.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 8bab5c051a869164fb2542cb43ceba8525523d20..be21dba7f244fe8911cc01a2e35e5c08a1215f12 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=157
+EXTRA_VERSION=158

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/addressbook.c b/src/addressbook.c
index 60f2af4f1ba40d1b77e97a8bb2b90db6af6e6424..9cc0077be4b30467d7bb4abf53d433a8244fa003 100644 (file)
--- 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 gint sort_column_number = 0;

+static GtkSortType sort_column_type = GTK_SORT_ASCENDING;

 
 static gint list_case_sort(
        GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2 )
 
 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 ) {
        } 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 ) {
                } else if( aio2->type == ITEMTYPE_GROUP ) {

-                       return 1;
+                       return (sort_column_type==GTK_SORT_ASCENDING) ? +1:-1;

                }
                return 0;
        }
                }
                return 0;
        }


@@ -719,6 +720,7 @@ static void addressbook_sort_list(GtkCList *clist, const gint col,
        GtkWidget *hbox, *label, *arrow;
 
        sort_column_number = 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);  
        gtk_clist_set_compare_func(clist, list_case_sort);
        gtk_clist_set_sort_type(clist, sort_type);
        gtk_clist_set_sort_column(clist, col);