[evolution-patches] evolution/addressbook patch for 44196

[Suresh Chandrasekharan <Suresh Chandrasekharan Eng Sun COM>]

Hi All,
	Check attached patch and lemme know.
	
Thanks & Regards,
Suresh

? cscope.out
? files
? a11y/addressbook/Makefile
? a11y/addressbook/Makefile.in
? addressbook/gui/widgets/.e-addressbook-view.c.swp
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1630
diff -u -r1.1630 ChangeLog
--- addressbook/ChangeLog	31 Mar 2004 03:36:50 -0000	1.1630
+++ addressbook/ChangeLog	12 Apr 2004 17:14:14 -0000
@@ -1,3 +1,17 @@
+2004-04-11  Suresh Chandrasekharan <suresh chandrasekharan sun com>
+
+	Fixes bug #44196 addressbook table view uses ASCII sort
+	
+	* addressbook/gui/widgets/e-addressbook-view.c (compare_subitems):
+	Uses g_utf8_collate for right UTF8 sort. Made faster using 
+	g_utf8_collate_key.
+
+	Also fixes a bug in 
+
+	* gui/component/select-names/e-select-names.c (select_entry_changed):
+	Changed g_utf8_collate for strcmp as we are already comparing keys
+	made from g_utf8_collate_key.
+
 2004-03-30  Chris Toshok  <toshok ximian com>
 
 	[ fixes bug #34777 ]
Index: addressbook/gui/component/select-names/e-select-names.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/e-select-names.c,v
retrieving revision 1.127
diff -u -r1.127 e-select-names.c
--- addressbook/gui/component/select-names/e-select-names.c	26 Feb 2004 21:01:32 -0000	1.127
+++ addressbook/gui/component/select-names/e-select-names.c	12 Apr 2004 17:14:15 -0000
@@ -422,7 +422,7 @@
 									    E_CONTACT_FULL_NAME,
 									    model_row),
 						    -1);
-			if (g_utf8_collate (select_strcoll_string, row_strcoll_string) <= 0) {
+			if (strcmp (select_strcoll_string, row_strcoll_string) <= 0) {
 				g_free (row_strcoll_string);
 				break;
 			}
Index: addressbook/gui/widgets/e-addressbook-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/widgets/e-addressbook-view.c,v
retrieving revision 1.137
diff -u -r1.137 e-addressbook-view.c
--- addressbook/gui/widgets/e-addressbook-view.c	30 Mar 2004 23:08:36 -0000	1.137
+++ addressbook/gui/widgets/e-addressbook-view.c	12 Apr 2004 17:14:15 -0000
@@ -1603,8 +1603,18 @@
 {
 	const ESearchBarSubitem *subitem_a = a;
 	const ESearchBarSubitem *subitem_b = b;
+	char *collate_a, *collate_b;
+	int ret;
 
-	return strcoll (subitem_a->text, subitem_b->text);
+	collate_a = g_utf8_collate_key (subitem_a->text, -1);
+	collate_b = g_utf8_collate_key (subitem_b->text, -1);
+
+	ret =  strcmp (collate_a, collate_b);
+
+	g_free (collate_a);
+	g_free (collate_b);
+	
+	return ret;
 }
 
 static void