[goffice] format selector: fix currency order.

[Morten Welinder <mortenw src gnome org>]

commit c512f2bc9d8a1af3e8992abdec6a273438f3c3f5
Author: Morten Welinder <terra gnome org>
Date:   Fri Jun 11 20:56:41 2010 -0400

    format selector: fix currency order.

 ChangeLog                   |    5 +++++
 NEWS                        |    1 +
 goffice/gtk/go-format-sel.c |    4 ++--
 3 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e04bda7..c99d058 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-11  Morten Welinder  <terra gnome org>
+
+	* goffice/gtk/go-format-sel.c (funny_currency_order): Fix order.
+	#621336.
+
 2010-06-04  Morten Welinder  <terra gnome org>
 
 	* goffice/utils/go-undo.c: Docoment all apis.
diff --git a/NEWS b/NEWS
index 4948e5b..2dd34a0 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ Morten:
 	* Fix point-on-graph crash.  [#620198]
 	* Ensure format menu has yyyy-mm-dd.
 	* Improve docs.
+	* Fix currency ordering.  [#621336]
 
 --------------------------------------------------------------------------
 goffice 0.8.5:
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index c28e8df..bf1c2e1 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -805,7 +805,7 @@ funny_currency_order (gconstpointer _a, gconstpointer _b)
 
 	if (a1) {
 		if (b1) {
-			return strcmp (a, b);
+			return g_utf8_collate (a, b);
 		} else {
 			return -1;
 		}
@@ -813,7 +813,7 @@ funny_currency_order (gconstpointer _a, gconstpointer _b)
 		if (b1) {
 			return +1;
 		} else {
-			return strcmp (a, b);
+			return g_utf8_collate (a, b);
 		}
 	}
 }