summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2009-10-08 22:27:52 -0400
committerRay Strode <rstrode@redhat.com>2009-10-08 22:29:43 -0400
commit5948d9eb0df6c2b4013b92ecf206500cc91ac430 (patch)
treea6903212143ed3df392f050320a383995c1bef2e
parent2a6f3b71612cf2db604c9edc07ab0603c4d49a3a (diff)
downloadgdm-5948d9eb0df6c2b4013b92ecf206500cc91ac430.tar.gz
Properly restore CTYPE when canonicalizing codeset
Spotted by Takao Fujiwara
-rw-r--r--gui/simple-greeter/gdm-languages.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/simple-greeter/gdm-languages.c b/gui/simple-greeter/gdm-languages.c
index b8c69878..8f898f1d 100644
--- a/gui/simple-greeter/gdm-languages.c
+++ b/gui/simple-greeter/gdm-languages.c
@@ -222,9 +222,9 @@ make_codeset_canonical_for_locale (const char *name,
{
char *old_locale;
- old_locale = setlocale (LC_CTYPE, name);
+ old_locale = setlocale (LC_CTYPE, NULL);
- if (old_locale == NULL) {
+ if (setlocale (LC_CTYPE, name) == NULL) {
return;
}