normalize the codeset before returning it

2008-02-25  Ray Strode  <rstrode@redhat.com>

	* gui/simple-greeter/gdm-languages.c:
	(gdm_parse_language_name):
	normalize the codeset before returning
	it

svn path=/trunk/; revision=5862

2 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d8ee963d..73fb7d30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
 
 	* gui/simple-greeter/gdm-languages.c:
 	(gdm_parse_language_name):
+	normalize the codeset before returning
+	it
+
+2008-02-25  Ray Strode  <rstrode@redhat.com>
+
+	* gui/simple-greeter/gdm-languages.c:
+	(gdm_parse_language_name):
 	If regex match returns empty string for one
 	of the components of a locale, just free it
 	and return NULL
diff --git a/gui/simple-greeter/gdm-languages.c b/gui/simple-greeter/gdm-languages.c
index 43f4e001..b642ff93 100644
--- a/gui/simple-greeter/gdm-languages.c
+++ b/gui/simple-greeter/gdm-languages.c
@@ -170,6 +170,14 @@ gdm_parse_language_name (const char *name,
                         g_free (*codesetp);
                         *codesetp = NULL;
                 }
+
+                if (*codesetp != NULL) {
+                        char *codeset;
+
+                        codeset = normalize_codeset (*codesetp);
+                        g_free (*codesetp);
+                        *codesetp = codeset;
+                }
         }
 
         if (modifierp != NULL) {