From: Jim Evins <evins@snaught.com>
Date: Wed, 2 Jan 2008 03:10:43 +0000 (+0000)
Subject: 2008-01-01  Jim Evins  <evins@snaught.com>
X-Git-Tag: glabels-2_2_5~48
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=655ca82e016d106d6d884ef2caf8f0434f14221a;p=glabels

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/branches/glabels-2_2@722 f5e0f49d-192f-0410-a22d-a8d8700d0965
---

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index 8c2623ac..c8e15651 100644
--- 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 8cad010a..bf99e1bb 100644
--- 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);