From fc462ee0902e36aff04c6032a3fc791716096a0d Mon Sep 17 00:00:00 2001 From: Andriy Grytsenko Date: Tue, 5 May 2015 21:35:54 +0300 Subject: [PATCH] Refreshing quilt patches. --- debian/patches/15-path-replace.patch | 2 +- debian/patches/22_ubuntu_i18n_oneiric.patch | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/15-path-replace.patch b/debian/patches/15-path-replace.patch index 3ba5cc6..2dcbf82 100644 --- a/debian/patches/15-path-replace.patch +++ b/debian/patches/15-path-replace.patch @@ -1,7 +1,7 @@ #launchpad bug : #524761 --- a/src/lxdm.c +++ b/src/lxdm.c -@@ -1319,7 +1319,7 @@ +@@ -1341,7 +1341,7 @@ path = g_key_file_get_string(config, "base", "path", 0); if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ diff --git a/debian/patches/22_ubuntu_i18n_oneiric.patch b/debian/patches/22_ubuntu_i18n_oneiric.patch index e37c8b9..5e88282 100644 --- a/debian/patches/22_ubuntu_i18n_oneiric.patch +++ b/debian/patches/22_ubuntu_i18n_oneiric.patch @@ -27,7 +27,7 @@ Author: Gunnar Hjalmarsson . /etc/X11/xinit/xinitrc-common --- a/src/lxdm.c +++ b/src/lxdm.c -@@ -1214,11 +1214,6 @@ +@@ -1236,11 +1236,6 @@ session=g_key_file_get_string(dmrc,"Desktop","Session",NULL); alloc_session=TRUE; } @@ -39,7 +39,7 @@ Author: Gunnar Hjalmarsson g_key_file_free(dmrc); } -@@ -1325,9 +1320,9 @@ +@@ -1347,9 +1342,9 @@ /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ if( lang && lang[0] ) { @@ -50,5 +50,5 @@ Author: Gunnar Hjalmarsson + env. variables from Xsession after ~/.profile has been sourced */ + env=g_environ_setenv(env, "GREETER_LANGUAGE", lang, TRUE); } - - #ifndef DISABLE_XAUTH + + if( session_desktop_names && session_desktop_names[0] ) -- 2.1.4