Don't modify the current locale. (#389300)

2006-12-27  Matthias Clasen  <mclasen@redhat.com>

        * glib/gunicollate.c (g_utf8_collate_key): Don't modify
        the current locale.  (#389300)

diff --git a/ChangeLog b/ChangeLog
index 6ff976d..8346588 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-27  Matthias Clasen  <mclasen@redhat.com>
+
+       * glib/gunicollate.c (g_utf8_collate_key): Don't modify
+       the current locale.  (#389300)
+
 2006-12-26  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gutf8.c: Add hints for locale-dependent interfaces.

diff --git a/glib/gunicollate.c b/glib/gunicollate.c
index 494d0a4..959c7ee 100644 (file)
--- a/glib/gunicollate.c
+++ b/glib/gunicollate.c
@@ -213,8 +213,6 @@ g_utf8_collate_key (const gchar *str,
 
   str_norm = _g_utf8_normalize_wc (str, len, G_NORMALIZE_ALL_COMPOSE);
 
-  setlocale (LC_COLLATE, "");
-
   xfrm_len = wcsxfrm (NULL, (wchar_t *)str_norm, 0);
   result_wc = g_new (wchar_t, xfrm_len + 1);
   wcsxfrm (result_wc, (wchar_t *)str_norm, xfrm_len + 1);