summaryrefslogtreecommitdiff
path: root/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c')
-rw-r--r--x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c30
1 files changed, 7 insertions, 23 deletions
diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
index 83a029a19632..cd8a0f496b5d 100644
--- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
+++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
@@ -1,27 +1,11 @@
---- gui/simple-greeter/gdm-languages.c.orig 2009-07-20 03:09:09.000000000 +0200
-+++ gui/simple-greeter/gdm-languages.c 2009-07-20 10:02:41.000000000 +0200
-@@ -168,13 +168,13 @@ gdm_parse_language_name (const char *nam
- *codesetp = NULL;
- }
-
-- if (*codesetp != NULL) {
-+/* if (*codesetp != NULL) {
- char *codeset;
-
- codeset = normalize_codeset (*codesetp);
- g_free (*codesetp);
- *codesetp = codeset;
-- }
-+ }*/
- }
-
- if (modifierp != NULL) {
-@@ -352,7 +352,7 @@ add_locale (const char *language_name)
- if (language_name_is_utf8 (language_name)) {
+--- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000
++++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000
+@@ -365,7 +365,7 @@ add_locale (const char *language_name,
+ if (is_utf8) {
name = g_strdup (language_name);
- } else {
+ } else if (utf8_only) {
- name = g_strdup_printf ("%s.utf8", language_name);
+ name = g_strdup_printf ("%s.UTF-8", language_name);
- if (!language_name_is_utf8 (name)) {
- g_free (name);
+ language_name_get_codeset_details (name, NULL, &is_utf8);
+ if (is_utf8) {