Index: libedataserver/e-categories.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserver/e-categories.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-categories.c
--- libedataserver/e-categories.c	16 Oct 2006 14:19:38 -0000	1.21
+++ libedataserver/e-categories.c	1 Nov 2006 16:40:46 -0000
@@ -423,7 +423,7 @@ e_categories_get_list (void)
 
 	g_hash_table_foreach (categories_table, add_hash_to_list, &list);
 
-	return g_list_sort (list, g_ascii_strcasecmp);
+	return g_list_sort (list, (GCompareFunc) g_utf8_collate);
 }
 
 /**
Index: libedataserverui/e-name-selector-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/libedataserverui/e-name-selector-dialog.c,v
retrieving revision 1.35
diff -u -p -r1.35 e-name-selector-dialog.c
--- libedataserverui/e-name-selector-dialog.c	17 Aug 2006 09:44:48 -0000	1.35
+++ libedataserverui/e-name-selector-dialog.c	1 Nov 2006 16:40:47 -0000
@@ -109,14 +109,6 @@ e_name_selector_dialog_set_property (GOb
 /* FIXME: category_list should become part of ENameSelectorDialog structure */
 GList *category_list;
 
-static int
-compare_func (const void *voida, const void *voidb)
-{
-	const char *stringa = voida;
-        const char *stringb = voidb;
-	return g_utf8_collate (stringa, stringb);
-}
-
 static void
 e_name_selector_dialog_populate_categories (ENameSelectorDialog *name_selector_dialog)
 {
@@ -125,9 +117,9 @@ e_name_selector_dialog_populate_categori
 	GList *l;
 	category_option_menu = glade_xml_get_widget (name_selector_dialog->gui, "optionmenu-category");
 
+	/* Categories are already sorted */
 	category_list = e_categories_get_list () ;
-	category_list = g_list_prepend (category_list, "Any Category");
-	category_list = g_list_sort (category_list, compare_func);
+	category_list = g_list_prepend (category_list, _("Any Category"));
 
 	category_menu = gtk_menu_new ();
 	l = category_list;
