~lightdm-team/lightdm/1.14

« back to all changes in this revision

Viewing changes to debian/patches/04_language_handling.patch

  • Committer: Robert Ancell
  • Date: 2015-11-20 03:06:59 UTC
  • Revision ID: robert.ancell@canonical.com-20151120030659-awdfj0nj9ppu16h6
Tags: 1.14.4
Releasing 1.14.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
Forwarded: not-needed
3
3
Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
4
4
 
5
 
Index: trunk/liblightdm-gobject/language.c
 
5
Index: 1.14/liblightdm-gobject/language.c
6
6
===================================================================
7
 
--- trunk.orig/liblightdm-gobject/language.c
8
 
+++ trunk/liblightdm-gobject/language.c
 
7
--- 1.14.orig/liblightdm-gobject/language.c
 
8
+++ 1.14/liblightdm-gobject/language.c
9
9
@@ -40,7 +40,7 @@ static GList *languages = NULL;
10
10
 static void
11
11
 update_languages (void)
56
56
             return language;
57
57
     }
58
58
 
59
 
Index: trunk/tests/scripts/language-env.conf
 
59
Index: 1.14/tests/scripts/language-env.conf
60
60
===================================================================
61
 
--- trunk.orig/tests/scripts/language-env.conf
62
 
+++ trunk/tests/scripts/language-env.conf
 
61
--- 1.14.orig/tests/scripts/language-env.conf
 
62
+++ 1.14/tests/scripts/language-env.conf
63
63
@@ -24,8 +24,8 @@ user-session=default
64
64
 #?SESSION-X-0 CONNECT-XSERVER
65
65
 
71
71
 #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
72
72
 #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU
73
73
 
74
 
Index: trunk/src/seat.c
 
74
Index: 1.14/src/seat.c
75
75
===================================================================
76
 
--- trunk.orig/src/seat.c
77
 
+++ trunk/src/seat.c
78
 
@@ -997,7 +997,7 @@ configure_session (Session *session, Ses
 
76
--- 1.14.orig/src/seat.c
 
77
+++ 1.14/src/seat.c
 
78
@@ -1013,7 +1013,7 @@ configure_session (Session *session, Ses
79
79
     }
80
80
     if (language && language[0] != '\0')
81
81
     {