rpms/evolution-data-server/devel evolution-data-server-1.9.1-fix-categories.patch, NONE, 1.1 evolution-data-server.spec, 1.134, 1.135

[fedora-cvs-commits at redhat.com]

Author: mbarnes

Update of /cvs/dist/rpms/evolution-data-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14423

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.9.1-fix-categories.patch 
Log Message:

* Wed Nov  1 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.1-3.fc7
- Add patch for Gnome.org bug #353924 (category sorting).


evolution-data-server-1.9.1-fix-categories.patch:
 libedataserver/e-categories.c             |    2 +-
 libedataserverui/e-name-selector-dialog.c |   12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

--- NEW FILE evolution-data-server-1.9.1-fix-categories.patch ---
--- evolution-data-server-1.9.1/libedataserverui/e-name-selector-dialog.c.fix-categories	2006-10-27 15:55:17.000000000 -0400
+++ evolution-data-server-1.9.1/libedataserverui/e-name-selector-dialog.c	2006-11-01 11:42:27.000000000 -0500
@@ -109,14 +109,6 @@
 /* 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 @@
 	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;
--- evolution-data-server-1.9.1/libedataserver/e-categories.c.fix-categories	2006-10-16 12:43:00.000000000 -0400
+++ evolution-data-server-1.9.1/libedataserver/e-categories.c	2006-11-01 11:42:27.000000000 -0500
@@ -423,7 +423,7 @@
 
 	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: evolution-data-server.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- evolution-data-server.spec	27 Oct 2006 20:33:17 -0000	1.134
+++ evolution-data-server.spec	1 Nov 2006 17:41:23 -0000	1.135
@@ -25,7 +25,7 @@
 
 Name: evolution-data-server
 Version: 1.9.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -65,6 +65,9 @@
 # Gnome.org bug #363965
 Patch22: evolution-data-server-1.9.1-kill-ememory.patch
 
+# Gnome.org bug #353924
+Patch23: evolution-data-server-1.9.1-fix-categories.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -154,6 +157,7 @@
 %patch20 -p1 -b .warn-incompatible-pointer-type
 %patch21 -p1 -b .kill-ethread
 %patch22 -p1 -b .kill-ememory
+%patch23 -p1 -b .fix-categories
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -371,6 +375,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Wed Nov  1 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.1-3.fc7
+- Add patch for Gnome.org bug #353924 (category sorting).
+
 * Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 1.9.1-2.fc7
 - Rebuild