2008-01-01 Jim Evins <evins@snaught.com>

	* src/merge-evolution.c:
		Do a case-insensitive sort.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@723 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index c9eb6cad956f5c7ced235c0a2e11ae8e593a0bce..07c26ab39822a510b026fb847239b366e7326ee3 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-01  Jim Evins  <evins@snaught.com>
+
+       * src/merge-evolution.c:
+               Do a case-insensitive sort.
+
 2008-01-01  Jim Evins  <evins@snaught.com>
 
        * src/merge-evolution.c:

diff --git a/glabels2/src/merge-evolution.c b/glabels2/src/merge-evolution.c
index 8cad010abbbff62a347e149170b472c135397511..bf99e1bb8a81565c0f715e95d5fac3b44555b1ae 100644 (file)
--- a/glabels2/src/merge-evolution.c
+++ b/glabels2/src/merge-evolution.c
@@ -37,6 +37,7 @@
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
+#include <libglabels/str.h>
 
 #include "debug.h"
 
@@ -273,9 +274,9 @@ static gint sort_contact_by_file_as(gconstpointer *a, gconstpointer *b)
   EContact *contact_b = E_CONTACT(b);
 
   // Extract file_as for each contact and compare...
-  char *a_file_as = e_contact_get (contact_a, E_CONTACT_FILE_AS);
-  char *b_file_as = e_contact_get (contact_b, E_CONTACT_FILE_AS);
-  int res = strcmp(a_file_as, b_file_as);
+  gchar *a_file_as = e_contact_get (contact_a, E_CONTACT_FILE_AS);
+  gchar *b_file_as = e_contact_get (contact_b, E_CONTACT_FILE_AS);
+  gint res = lgl_str_utf8_casecmp(a_file_as, b_file_as);
 
   gl_debug(DEBUG_MERGE, "Sort comparing contacts '%s' and '%s' = %d", a_file_as, b_file_as, res);