diff options
Diffstat (limited to 'debian/patches/04_language_handling.patch')
| -rw-r--r-- | debian/patches/04_language_handling.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch index 809fe890..17e0dae2 100644 --- a/debian/patches/04_language_handling.patch +++ b/debian/patches/04_language_handling.patch @@ -2,20 +2,20 @@ Description: Adjustments due to handling of languages Forwarded: not-needed Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com> -Index: trunk/liblightdm-gobject/language.c +Index: lightdm/liblightdm-gobject/language.c =================================================================== ---- trunk.orig/liblightdm-gobject/language.c -+++ trunk/liblightdm-gobject/language.c +--- lightdm.orig/liblightdm-gobject/language.c ++++ lightdm/liblightdm-gobject/language.c @@ -60,7 +60,7 @@ static GList *languages = NULL; static void update_languages (void) { - gchar *command = "locale -a"; + gchar *command = "/usr/share/language-tools/language-options"; - gchar *stdout_text = NULL, *stderr_text = NULL; + g_autofree gchar *stdout_text = NULL; + g_autofree gchar *stderr_text = NULL; gint exit_status; - gboolean result; -@@ -181,15 +181,39 @@ lightdm_get_language (void) +@@ -168,15 +168,39 @@ lightdm_get_language (void) { const gchar *lang; GList *link; @@ -56,10 +56,10 @@ Index: trunk/liblightdm-gobject/language.c return language; } -Index: trunk/tests/scripts/language-env.conf +Index: lightdm/tests/scripts/language-env.conf =================================================================== ---- trunk.orig/tests/scripts/language-env.conf -+++ trunk/tests/scripts/language-env.conf +--- lightdm.orig/tests/scripts/language-env.conf ++++ lightdm/tests/scripts/language-env.conf @@ -24,8 +24,8 @@ user-session=default #?SESSION-X-0 CONNECT-XSERVER @@ -71,11 +71,11 @@ Index: trunk/tests/scripts/language-env.conf #?*SESSION-X-0 READ-ENV NAME=GDM_LANG #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU -Index: trunk/src/seat.c +Index: lightdm/src/seat.c =================================================================== ---- trunk.orig/src/seat.c -+++ trunk/src/seat.c -@@ -1016,7 +1016,7 @@ configure_session (Session *session, Ses +--- lightdm.orig/src/seat.c ++++ lightdm/src/seat.c +@@ -1008,7 +1008,7 @@ configure_session (Session *session, Ses } if (language && language[0] != '\0') { |