← Back to branch summary

~ubuntu-branches/ubuntu/trusty/lightdm/trusty-proposed

« back to all changes in this revision

Viewing changes to debian/patches/04_language_handling.patch

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2014-03-25 14:45:54 UTC
  • Revision ID: package-import@ubuntu.com-20140325144554-3r1xxa7xms68mk5x
Tags: 1.9.13-0ubuntu1
https://launchpad.net/bugs/1235915
* New upstream release:
  - Handle not getting an X connection when attempting to get X layouts.
    (LP: #1235915)
  - Read config data from both XDG_DATA_DIRS and XDG_CONFIG_DIRS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04_language_handling.patch
4
4
 
5
5
Index: trunk/liblightdm-gobject/language.c
6
6
===================================================================
7
 
--- trunk.orig/liblightdm-gobject/language.c    2014-03-06 16:35:25.899347214 +1300
8
 
+++ trunk/liblightdm-gobject/language.c 2014-03-06 16:35:25.891347214 +1300
 
7
--- trunk.orig/liblightdm-gobject/language.c    2014-03-18 10:43:32.473863308 +1300
 
8
+++ trunk/liblightdm-gobject/language.c 2014-03-18 10:43:32.469863307 +1300
9
9
@@ -40,7 +40,7 @@
10
10
 static void
11
11
 update_languages (void)
58
58
 
59
59
Index: trunk/tests/scripts/language-env.conf
60
60
===================================================================
61
 
--- trunk.orig/tests/scripts/language-env.conf  2014-03-06 16:35:25.899347214 +1300
62
 
+++ trunk/tests/scripts/language-env.conf       2014-03-06 16:35:25.895347214 +1300
63
 
@@ -23,8 +23,8 @@
 
61
--- trunk.orig/tests/scripts/language-env.conf  2014-03-18 10:43:32.473863308 +1300
 
62
+++ trunk/tests/scripts/language-env.conf       2014-03-18 10:43:32.469863307 +1300
 
63
@@ -24,8 +24,8 @@
64
64
 #?SESSION-X-0 CONNECT-XSERVER
65
65
 
66
66
 # Check environment variables
73
73
 
74
74
Index: trunk/src/seat.c
75
75
===================================================================
76
 
--- trunk.orig/src/seat.c       2014-03-06 16:35:25.899347214 +1300
77
 
+++ trunk/src/seat.c    2014-03-06 16:35:25.895347214 +1300
78
 
@@ -854,7 +854,7 @@
 
76
--- trunk.orig/src/seat.c       2014-03-18 10:43:32.473863308 +1300
 
77
+++ trunk/src/seat.c    2014-03-18 10:43:32.469863307 +1300
 
78
@@ -867,7 +867,7 @@
79
79
         session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
80
80
     if (language && language[0] != '\0')
81
81
     {