From d1be55cccbd6565fc814d0ca1b0ef47a64c78ae6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Dec 2006 05:12:47 +0000 Subject: [PATCH] Don't modify the current locale. (#389300) 2006-12-27 Matthias Clasen * glib/gunicollate.c (g_utf8_collate_key): Don't modify the current locale. (#389300) --- ChangeLog | 5 +++++ glib/gunicollate.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6ff976d..8346588 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-12-27 Matthias Clasen + + * glib/gunicollate.c (g_utf8_collate_key): Don't modify + the current locale. (#389300) + 2006-12-26 Matthias Clasen * glib/gutf8.c: Add hints for locale-dependent interfaces. diff --git a/glib/gunicollate.c b/glib/gunicollate.c index 494d0a4..959c7ee 100644 --- 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); -- 2.7.4