diff options
| author | Ray Strode <rstrode@redhat.com> | 2008-02-25 21:35:30 +0000 |
|---|---|---|
| committer | Ray Strode <halfline@src.gnome.org> | 2008-02-25 21:35:30 +0000 |
| commit | 1e8984a713dc608901786033c7c73a21aab3a5b4 (patch) | |
| tree | 983766a9922e7acadc0e1f4d9373d7f36e906543 | |
| parent | d5f141945ce4503fa1bd983130295051f595d106 (diff) | |
| download | gdm-1e8984a713dc608901786033c7c73a21aab3a5b4.tar.gz | |
new function to fold the various legal forms for codeset into one
2008-02-25 Ray Strode <rstrode@redhat.com>
* gui/simple-greeter/gdm-languages.c:
(normalize_codeset): new function to
fold the various legal forms for codeset
into one consistent format
svn path=/trunk/; revision=5860
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gui/simple-greeter/gdm-languages.c | 26 |
2 files changed, 33 insertions, 0 deletions
@@ -1,6 +1,13 @@ 2008-02-25 Ray Strode <rstrode@redhat.com> * gui/simple-greeter/gdm-languages.c: + (normalize_codeset): new function to + fold the various legal forms for codeset + into one consistent format + +2008-02-25 Ray Strode <rstrode@redhat.com> + + * gui/simple-greeter/gdm-languages.c: (gdm_parse_language_name): update locale parsing regex to cover more valid locales diff --git a/gui/simple-greeter/gdm-languages.c b/gui/simple-greeter/gdm-languages.c index b5009908..f068ee36 100644 --- a/gui/simple-greeter/gdm-languages.c +++ b/gui/simple-greeter/gdm-languages.c @@ -80,6 +80,32 @@ chooser_locale_free (GdmLocale *locale) g_free (locale); } +static char * +normalize_codeset (const char *codeset) +{ + char *normalized_codeset; + const char *p; + char *q; + + normalized_codeset = g_strdup (codeset); + + if (codeset != NULL) { + for (p = codeset, q = normalized_codeset; + *p != '\0'; p++) { + + if (*p == '-' || *p == '_') { + continue; + } + + *q = g_ascii_tolower (*p); + q++; + } + *q = '\0'; + } + + return normalized_codeset; +} + /* * According to http://en.wikipedia.org/wiki/Locale * locale names are of the form: |