Light Display Manager

Merge lp:~robert-ancell/lightdm/xdg-session-desktop into lp:lightdm

  1. xdg-session-desktop
  2. Merge into trunk
Proposed by Robert Ancell
Status: Merged
Merged at revision: 1953
Proposed branch: lp:~robert-ancell/lightdm/xdg-session-desktop
Merge into: lp:lightdm
Diff against target: 1688 lines (+143/-130)
116 files modified
src/mir-server.c (+3/-0)
src/seat.c (+1/-0)
src/unity-system-compositor.c (+3/-0)
src/x-server.c (+3/-0)
tests/scripts/additional-config-priority.conf (+1/-1)
tests/scripts/additional-config.conf (+1/-1)
tests/scripts/additional-system-config-priority.conf (+1/-1)
tests/scripts/additional-system-config.conf (+1/-1)
tests/scripts/autologin-guest-in-background.conf (+1/-1)
tests/scripts/autologin-guest-logout.conf (+1/-1)
tests/scripts/autologin-guest-session-config.conf (+1/-1)
tests/scripts/autologin-guest-timeout.conf (+1/-1)
tests/scripts/autologin-guest.conf (+1/-1)
tests/scripts/autologin-in-background.conf (+1/-1)
tests/scripts/autologin-invalid-greeter.conf (+1/-1)
tests/scripts/autologin-logout.conf (+1/-1)
tests/scripts/autologin-previous-session.conf (+1/-1)
tests/scripts/autologin-session-crash.conf (+1/-1)
tests/scripts/autologin-timeout-in-background.conf (+1/-1)
tests/scripts/autologin-timeout.conf (+1/-1)
tests/scripts/autologin-xserver-crash.conf (+1/-1)
tests/scripts/autologin.conf (+1/-1)
tests/scripts/console-kit.conf (+1/-1)
tests/scripts/corrupt-xauthority.conf (+1/-1)
tests/scripts/dbus.conf (+1/-1)
tests/scripts/group-membership.conf (+1/-1)
tests/scripts/guest-wrapper.conf (+1/-1)
tests/scripts/home-dir-on-authenticate.conf (+1/-1)
tests/scripts/home-dir-on-session.conf (+1/-1)
tests/scripts/language-env.conf (+1/-1)
tests/scripts/lock-seat-console-kit.conf (+1/-1)
tests/scripts/lock-seat-return-session-console-kit.conf (+1/-1)
tests/scripts/lock-seat-return-session.conf (+1/-1)
tests/scripts/lock-seat.conf (+1/-1)
tests/scripts/lock-session-no-password.conf (+1/-1)
tests/scripts/lock-session-return-session.conf (+1/-1)
tests/scripts/lock-session.conf (+1/-1)
tests/scripts/login-guest-logout.conf (+1/-1)
tests/scripts/login-guest-pick-session.conf (+1/-1)
tests/scripts/login-guest-session-config.conf (+1/-1)
tests/scripts/login-guest.conf (+1/-1)
tests/scripts/login-logout.conf (+1/-1)
tests/scripts/login-manual-previous-session.conf (+1/-1)
tests/scripts/login-manual-remember-session.conf (+2/-2)
tests/scripts/login-manual.conf (+1/-1)
tests/scripts/login-new-authtok.conf (+1/-1)
tests/scripts/login-no-password.conf (+1/-1)
tests/scripts/login-pam.conf (+1/-1)
tests/scripts/login-pick-session.conf (+1/-1)
tests/scripts/login-previous-session.conf (+1/-1)
tests/scripts/login-remember-session.conf (+2/-2)
tests/scripts/login-remote-session.conf (+1/-1)
tests/scripts/login-session-crash.conf (+1/-1)
tests/scripts/login-xserver-crash.conf (+1/-1)
tests/scripts/login.conf (+1/-1)
tests/scripts/mir-autologin.conf (+1/-1)
tests/scripts/mir-session-compositor-crash.conf (+1/-1)
tests/scripts/mir-session-crash.conf (+1/-1)
tests/scripts/mir-session.conf (+1/-1)
tests/scripts/no-accounts-service.conf (+1/-1)
tests/scripts/no-console-kit-or-login1.conf (+1/-1)
tests/scripts/no-console-kit.conf (+1/-1)
tests/scripts/no-login1.conf (+1/-1)
tests/scripts/open-file-descriptors.conf (+1/-1)
tests/scripts/pam.conf (+1/-1)
tests/scripts/script-hooks.conf (+1/-1)
tests/scripts/session-stderr-backup.conf (+3/-3)
tests/scripts/session-stderr-multi-write.conf (+1/-1)
tests/scripts/session-stderr.conf (+1/-1)
tests/scripts/session-stdout.conf (+1/-1)
tests/scripts/shared-data-greeter-to-session.conf (+1/-1)
tests/scripts/shared-data-session-to-greeter-autologin.conf (+1/-1)
tests/scripts/shared-data-session-to-greeter.conf (+1/-1)
tests/scripts/surfaceflinger-autologin.conf (+1/-1)
tests/scripts/switch-to-greeter-new-session.conf (+2/-2)
tests/scripts/switch-to-greeter-return-session-logout.conf (+1/-1)
tests/scripts/switch-to-greeter-return-session.conf (+1/-1)
tests/scripts/switch-to-greeter.conf (+1/-1)
tests/scripts/switch-to-guest.conf (+2/-2)
tests/scripts/switch-to-user-active.conf (+1/-1)
tests/scripts/switch-to-user-existing-no-password.conf (+2/-2)
tests/scripts/switch-to-user-existing.conf (+2/-2)
tests/scripts/switch-to-user-logout-active.conf (+2/-2)
tests/scripts/switch-to-user-logout-inactive.conf (+2/-2)
tests/scripts/switch-to-user-no-password.conf (+2/-2)
tests/scripts/switch-to-user.conf (+1/-1)
tests/scripts/switch-to-users.conf (+3/-3)
tests/scripts/system-xauthority.conf (+1/-1)
tests/scripts/unity-autologin.conf (+1/-1)
tests/scripts/unity-compositor-mir-next-session.conf (+1/-1)
tests/scripts/unity-compositor-next-session.conf (+1/-1)
tests/scripts/unity-login.conf (+1/-1)
tests/scripts/unity-mir-autologin.conf (+1/-1)
tests/scripts/unity-mir-greeter-mir-session.conf (+1/-1)
tests/scripts/unity-mir-greeter-x-session.conf (+1/-1)
tests/scripts/unity-mir-lock-seat.conf (+1/-1)
tests/scripts/unity-mir-session-x-greeter.conf (+1/-1)
tests/scripts/unity-plymouth.conf (+1/-1)
tests/scripts/unity-switch.conf (+2/-2)
tests/scripts/unity-xdg-seat.conf (+1/-1)
tests/scripts/upstart-autologin.conf (+1/-1)
tests/scripts/upstart-login.conf (+1/-1)
tests/scripts/user-logged-in.conf (+1/-1)
tests/scripts/user-renamed.conf (+1/-1)
tests/scripts/user-session.conf (+2/-2)
tests/scripts/utmp-autologin.conf (+1/-1)
tests/scripts/utmp-login.conf (+1/-1)
tests/scripts/vnc-login.conf (+1/-1)
tests/scripts/vnc-open-file-descriptors.conf (+1/-1)
tests/scripts/xauthority.conf (+1/-1)
tests/scripts/xdg-current-desktop.conf (+1/-1)
tests/scripts/xdg-seat.conf (+1/-1)
tests/scripts/xdmcp-server-login.conf (+1/-1)
tests/scripts/xdmcp-server-open-file-descriptors.conf (+1/-1)
tests/scripts/xserver-no-share.conf (+1/-1)
tests/src/test-session.c (+7/-4)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/xdg-session-desktop
Reviewer Review Type Date Requested Status
Robert Ancell Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+214108@code.launchpad.net

Commit message

Set XDG_SESSION_TYPE and XDG_SESSION_DESKTOP as used by systemd

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

See http://www.freedesktop.org/software/systemd/man/pam_systemd.html

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1949
http://jenkins.qa.ubuntu.com/job/lightdm-ci/268/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-amd64-ci/62
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-trusty-armhf-ci/62

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/lightdm-ci/268/rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Ancell (robert-ancell) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mir-server.c'
2--- src/mir-server.c 2013-12-06 15:21:41 +0000
3+++ src/mir-server.c 2014-04-03 20:07:08 +0000
4@@ -67,6 +67,8 @@
5 {
6 MirServer *server;
7
8+ session_set_env (session, "XDG_SESSION_TYPE", "mir");
9+
10 server = MIR_SERVER (display_server);
11 if (server->priv->parent_socket)
12 session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
13@@ -81,6 +83,7 @@
14 static void
15 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
16 {
17+ session_unset_env (session, "XDG_SESSION_TYPE");
18 session_unset_env (session, "MIR_SOCKET");
19 session_unset_env (session, "MIR_SERVER_VT");
20 }
21
22=== modified file 'src/seat.c'
23--- src/seat.c 2014-03-17 18:45:29 +0000
24+++ src/seat.c 2014-04-03 20:07:08 +0000
25@@ -860,6 +860,7 @@
26 const gchar *desktop_name;
27
28 session_set_session_type (session, session_config_get_session_type (config));
29+ session_set_env (session, "XDG_SESSION_DESKTOP", session_name);
30 session_set_env (session, "DESKTOP_SESSION", session_name);
31 session_set_env (session, "GDMSESSION", session_name);
32 desktop_name = session_config_get_desktop_name (config);
33
34=== modified file 'src/unity-system-compositor.c'
35--- src/unity-system-compositor.c 2014-03-19 21:35:22 +0000
36+++ src/unity-system-compositor.c 2014-04-03 20:07:08 +0000
37@@ -179,6 +179,8 @@
38 UnitySystemCompositor *compositor = UNITY_SYSTEM_COMPOSITOR (display_server);
39 const gchar *name;
40
41+ session_set_env (session, "XDG_SESSION_TYPE", "mir");
42+
43 if (compositor->priv->socket)
44 session_set_env (session, "MIR_SOCKET", compositor->priv->socket);
45 if (IS_GREETER (session))
46@@ -198,6 +200,7 @@
47 static void
48 unity_system_compositor_disconnect_session (DisplayServer *display_server, Session *session)
49 {
50+ session_unset_env (session, "XDG_SESSION_TYPE");
51 session_unset_env (session, "MIR_SOCKET");
52 session_unset_env (session, "MIR_SERVER_NAME");
53 session_unset_env (session, "XDG_VTNR");
54
55=== modified file 'src/x-server.c'
56--- src/x-server.c 2014-02-05 15:06:29 +0000
57+++ src/x-server.c 2014-04-03 20:07:08 +0000
58@@ -149,6 +149,8 @@
59 {
60 gint vt;
61
62+ session_set_env (session, "XDG_SESSION_TYPE", "x11");
63+
64 display_server = session_get_display_server (session);
65
66 vt = display_server_get_vt (display_server);
67@@ -180,6 +182,7 @@
68 {
69 gint vt;
70
71+ session_unset_env (session, "XDG_SESSION_TYPE");
72 vt = display_server_get_vt (display_server);
73 if (vt > 0)
74 {
75
76=== modified file 'tests/scripts/additional-config-priority.conf'
77--- tests/scripts/additional-config-priority.conf 2014-03-17 18:33:02 +0000
78+++ tests/scripts/additional-config-priority.conf 2014-04-03 20:07:08 +0000
79@@ -21,7 +21,7 @@
80 #?XSERVER-0 ACCEPT-CONNECT
81
82 # Session starts
83-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
84+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
85 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
86 #?XSERVER-0 ACCEPT-CONNECT
87 #?SESSION-X-0 CONNECT-XSERVER
88
89=== modified file 'tests/scripts/additional-config.conf'
90--- tests/scripts/additional-config.conf 2014-03-17 18:33:02 +0000
91+++ tests/scripts/additional-config.conf 2014-04-03 20:07:08 +0000
92@@ -20,7 +20,7 @@
93 #?XSERVER-0 ACCEPT-CONNECT
94
95 # Session starts
96-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
97+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
98 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
99 #?XSERVER-0 ACCEPT-CONNECT
100 #?SESSION-X-0 CONNECT-XSERVER
101
102=== modified file 'tests/scripts/additional-system-config-priority.conf'
103--- tests/scripts/additional-system-config-priority.conf 2014-03-17 18:33:02 +0000
104+++ tests/scripts/additional-system-config-priority.conf 2014-04-03 20:07:08 +0000
105@@ -21,7 +21,7 @@
106 #?XSERVER-0 ACCEPT-CONNECT
107
108 # Session starts
109-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
110+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
111 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
112 #?XSERVER-0 ACCEPT-CONNECT
113 #?SESSION-X-0 CONNECT-XSERVER
114
115=== modified file 'tests/scripts/additional-system-config.conf'
116--- tests/scripts/additional-system-config.conf 2014-03-17 18:33:02 +0000
117+++ tests/scripts/additional-system-config.conf 2014-04-03 20:07:08 +0000
118@@ -20,7 +20,7 @@
119 #?XSERVER-0 ACCEPT-CONNECT
120
121 # Session starts
122-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
123+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
124 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
125 #?XSERVER-0 ACCEPT-CONNECT
126 #?SESSION-X-0 CONNECT-XSERVER
127
128=== modified file 'tests/scripts/autologin-guest-in-background.conf'
129--- tests/scripts/autologin-guest-in-background.conf 2014-03-17 18:33:02 +0000
130+++ tests/scripts/autologin-guest-in-background.conf 2014-04-03 20:07:08 +0000
131@@ -28,7 +28,7 @@
132 #?XSERVER-1 INDICATE-READY
133 #?XSERVER-1 ACCEPT-CONNECT
134 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
135-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
136+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
137 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
138 #?XSERVER-1 ACCEPT-CONNECT
139 #?SESSION-X-1 CONNECT-XSERVER
140
141=== modified file 'tests/scripts/autologin-guest-logout.conf'
142--- tests/scripts/autologin-guest-logout.conf 2014-03-17 18:33:02 +0000
143+++ tests/scripts/autologin-guest-logout.conf 2014-04-03 20:07:08 +0000
144@@ -21,7 +21,7 @@
145 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
146
147 # Guest session starts
148-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
149+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
150 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
151 #?XSERVER-0 ACCEPT-CONNECT
152 #?SESSION-X-0 CONNECT-XSERVER
153
154=== modified file 'tests/scripts/autologin-guest-session-config.conf'
155--- tests/scripts/autologin-guest-session-config.conf 2014-03-17 18:33:02 +0000
156+++ tests/scripts/autologin-guest-session-config.conf 2014-04-03 20:07:08 +0000
157@@ -22,7 +22,7 @@
158 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
159
160 # Guest session starts
161-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
162+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
163 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
164 #?XSERVER-0 ACCEPT-CONNECT
165 #?SESSION-X-0 CONNECT-XSERVER
166
167=== modified file 'tests/scripts/autologin-guest-timeout.conf'
168--- tests/scripts/autologin-guest-timeout.conf 2014-03-17 18:33:02 +0000
169+++ tests/scripts/autologin-guest-timeout.conf 2014-04-03 20:07:08 +0000
170@@ -39,7 +39,7 @@
171 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
172
173 # Guest session starts
174-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
175+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
176 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
177 #?XSERVER-0 ACCEPT-CONNECT
178 #?SESSION-X-0 CONNECT-XSERVER
179
180=== modified file 'tests/scripts/autologin-guest.conf'
181--- tests/scripts/autologin-guest.conf 2014-03-17 18:33:02 +0000
182+++ tests/scripts/autologin-guest.conf 2014-04-03 20:07:08 +0000
183@@ -21,7 +21,7 @@
184 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
185
186 # Guest session starts
187-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
188+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
189 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
190 #?XSERVER-0 ACCEPT-CONNECT
191 #?SESSION-X-0 CONNECT-XSERVER
192
193=== modified file 'tests/scripts/autologin-in-background.conf'
194--- tests/scripts/autologin-in-background.conf 2014-03-17 18:33:02 +0000
195+++ tests/scripts/autologin-in-background.conf 2014-04-03 20:07:08 +0000
196@@ -27,7 +27,7 @@
197 #?*XSERVER-1 INDICATE-READY
198 #?XSERVER-1 INDICATE-READY
199 #?XSERVER-1 ACCEPT-CONNECT
200-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
201+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
202 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
203 #?XSERVER-1 ACCEPT-CONNECT
204 #?SESSION-X-1 CONNECT-XSERVER
205
206=== modified file 'tests/scripts/autologin-invalid-greeter.conf'
207--- tests/scripts/autologin-invalid-greeter.conf 2014-03-17 18:33:02 +0000
208+++ tests/scripts/autologin-invalid-greeter.conf 2014-04-03 20:07:08 +0000
209@@ -18,7 +18,7 @@
210 #?XSERVER-0 ACCEPT-CONNECT
211
212 # Session starts
213-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
214+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
215 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
216 #?XSERVER-0 ACCEPT-CONNECT
217 #?SESSION-X-0 CONNECT-XSERVER
218
219=== modified file 'tests/scripts/autologin-logout.conf'
220--- tests/scripts/autologin-logout.conf 2014-03-17 18:33:02 +0000
221+++ tests/scripts/autologin-logout.conf 2014-04-03 20:07:08 +0000
222@@ -18,7 +18,7 @@
223 #?XSERVER-0 ACCEPT-CONNECT
224
225 # Autologin session starts
226-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
227+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
228 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
229 #?XSERVER-0 ACCEPT-CONNECT
230 #?SESSION-X-0 CONNECT-XSERVER
231
232=== modified file 'tests/scripts/autologin-previous-session.conf'
233--- tests/scripts/autologin-previous-session.conf 2014-03-17 18:33:02 +0000
234+++ tests/scripts/autologin-previous-session.conf 2014-04-03 20:07:08 +0000
235@@ -17,7 +17,7 @@
236 #?XSERVER-0 ACCEPT-CONNECT
237
238 # Session starts
239-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
240+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
241 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
242 #?XSERVER-0 ACCEPT-CONNECT
243 #?SESSION-X-0 CONNECT-XSERVER
244
245=== modified file 'tests/scripts/autologin-session-crash.conf'
246--- tests/scripts/autologin-session-crash.conf 2014-03-17 18:33:02 +0000
247+++ tests/scripts/autologin-session-crash.conf 2014-04-03 20:07:08 +0000
248@@ -18,7 +18,7 @@
249 #?XSERVER-0 ACCEPT-CONNECT
250
251 # Session starts
252-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
253+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
254 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
255 #?XSERVER-0 ACCEPT-CONNECT
256 #?SESSION-X-0 CONNECT-XSERVER
257
258=== modified file 'tests/scripts/autologin-timeout-in-background.conf'
259--- tests/scripts/autologin-timeout-in-background.conf 2014-03-17 18:33:02 +0000
260+++ tests/scripts/autologin-timeout-in-background.conf 2014-04-03 20:07:08 +0000
261@@ -28,7 +28,7 @@
262 #?*XSERVER-1 INDICATE-READY
263 #?XSERVER-1 INDICATE-READY
264 #?XSERVER-1 ACCEPT-CONNECT
265-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
266+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
267 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
268 #?XSERVER-1 ACCEPT-CONNECT
269 #?SESSION-X-1 CONNECT-XSERVER
270
271=== modified file 'tests/scripts/autologin-timeout.conf'
272--- tests/scripts/autologin-timeout.conf 2014-03-17 18:33:02 +0000
273+++ tests/scripts/autologin-timeout.conf 2014-04-03 20:07:08 +0000
274@@ -36,7 +36,7 @@
275 #?GREETER-X-0 TERMINATE SIGNAL=15
276
277 # Session starts
278-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
279+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
280 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
281 #?XSERVER-0 ACCEPT-CONNECT
282 #?SESSION-X-0 CONNECT-XSERVER
283
284=== modified file 'tests/scripts/autologin-xserver-crash.conf'
285--- tests/scripts/autologin-xserver-crash.conf 2014-03-17 18:33:02 +0000
286+++ tests/scripts/autologin-xserver-crash.conf 2014-04-03 20:07:08 +0000
287@@ -18,7 +18,7 @@
288 #?XSERVER-0 ACCEPT-CONNECT
289
290 # Session starts
291-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
292+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
293 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
294 #?XSERVER-0 ACCEPT-CONNECT
295 #?SESSION-X-0 CONNECT-XSERVER
296
297=== modified file 'tests/scripts/autologin.conf'
298--- tests/scripts/autologin.conf 2014-03-17 18:33:02 +0000
299+++ tests/scripts/autologin.conf 2014-04-03 20:07:08 +0000
300@@ -18,7 +18,7 @@
301 #?XSERVER-0 ACCEPT-CONNECT
302
303 # Session starts
304-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
305+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
306 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
307 #?XSERVER-0 ACCEPT-CONNECT
308 #?SESSION-X-0 CONNECT-XSERVER
309
310=== modified file 'tests/scripts/console-kit.conf'
311--- tests/scripts/console-kit.conf 2014-03-17 18:33:02 +0000
312+++ tests/scripts/console-kit.conf 2014-04-03 20:07:08 +0000
313@@ -21,7 +21,7 @@
314 #?XSERVER-0 ACCEPT-CONNECT
315
316 # Session starts
317-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
318+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
319 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
320 #?XSERVER-0 ACCEPT-CONNECT
321 #?SESSION-X-0 CONNECT-XSERVER
322
323=== modified file 'tests/scripts/corrupt-xauthority.conf'
324--- tests/scripts/corrupt-xauthority.conf 2014-03-17 18:33:02 +0000
325+++ tests/scripts/corrupt-xauthority.conf 2014-04-03 20:07:08 +0000
326@@ -18,7 +18,7 @@
327 #?XSERVER-0 ACCEPT-CONNECT
328
329 # Session starts
330-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth DESKTOP_SESSION=default USER=corrupt-xauth
331+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/corrupt-xauth XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=corrupt-xauth
332 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
333 #?XSERVER-0 ACCEPT-CONNECT
334 #?SESSION-X-0 CONNECT-XSERVER
335
336=== modified file 'tests/scripts/dbus.conf'
337--- tests/scripts/dbus.conf 2014-03-17 18:33:02 +0000
338+++ tests/scripts/dbus.conf 2014-04-03 20:07:08 +0000
339@@ -38,7 +38,7 @@
340 #?GREETER-X-0 TERMINATE SIGNAL=15
341
342 # Session starts
343-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
344+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
345 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
346 #?XSERVER-0 ACCEPT-CONNECT
347 #?SESSION-X-0 CONNECT-XSERVER
348
349=== modified file 'tests/scripts/group-membership.conf'
350--- tests/scripts/group-membership.conf 2014-03-17 18:33:02 +0000
351+++ tests/scripts/group-membership.conf 2014-04-03 20:07:08 +0000
352@@ -18,7 +18,7 @@
353 #?XSERVER-0 ACCEPT-CONNECT
354
355 # Session starts
356-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member DESKTOP_SESSION=default USER=group-member
357+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/group-member XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=group-member
358 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
359 #?XSERVER-0 ACCEPT-CONNECT
360 #?SESSION-X-0 CONNECT-XSERVER
361
362=== modified file 'tests/scripts/guest-wrapper.conf'
363--- tests/scripts/guest-wrapper.conf 2014-03-17 18:33:02 +0000
364+++ tests/scripts/guest-wrapper.conf 2014-04-03 20:07:08 +0000
365@@ -25,7 +25,7 @@
366 #?GUEST-WRAPPER-X-0 START
367
368 # Guest session starts
369-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
370+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
371 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
372 #?XSERVER-0 ACCEPT-CONNECT
373 #?SESSION-X-0 CONNECT-XSERVER
374
375=== modified file 'tests/scripts/home-dir-on-authenticate.conf'
376--- tests/scripts/home-dir-on-authenticate.conf 2014-03-17 18:33:02 +0000
377+++ tests/scripts/home-dir-on-authenticate.conf 2014-04-03 20:07:08 +0000
378@@ -18,7 +18,7 @@
379 #?XSERVER-0 ACCEPT-CONNECT
380
381 # Session starts
382-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir DESKTOP_SESSION=default USER=mount-home-dir
383+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/mount-home-dir XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=mount-home-dir
384 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
385 #?XSERVER-0 ACCEPT-CONNECT
386 #?SESSION-X-0 CONNECT-XSERVER
387
388=== modified file 'tests/scripts/home-dir-on-session.conf'
389--- tests/scripts/home-dir-on-session.conf 2014-03-17 18:33:02 +0000
390+++ tests/scripts/home-dir-on-session.conf 2014-04-03 20:07:08 +0000
391@@ -18,7 +18,7 @@
392 #?XSERVER-0 ACCEPT-CONNECT
393
394 # Session starts
395-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir DESKTOP_SESSION=default USER=make-home-dir
396+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/make-home-dir XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=make-home-dir
397 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
398 #?XSERVER-0 ACCEPT-CONNECT
399 #?SESSION-X-0 CONNECT-XSERVER
400
401=== modified file 'tests/scripts/language-env.conf'
402--- tests/scripts/language-env.conf 2014-03-17 18:33:02 +0000
403+++ tests/scripts/language-env.conf 2014-04-03 20:07:08 +0000
404@@ -18,7 +18,7 @@
405 #?XSERVER-0 ACCEPT-CONNECT
406
407 # Session starts
408-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language DESKTOP_SESSION=default USER=have-language
409+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-language XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-language
410 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
411 #?XSERVER-0 ACCEPT-CONNECT
412 #?SESSION-X-0 CONNECT-XSERVER
413
414=== modified file 'tests/scripts/lock-seat-console-kit.conf'
415--- tests/scripts/lock-seat-console-kit.conf 2014-03-17 18:33:02 +0000
416+++ tests/scripts/lock-seat-console-kit.conf 2014-04-03 20:07:08 +0000
417@@ -21,7 +21,7 @@
418 #?XSERVER-0 ACCEPT-CONNECT
419
420 # Session starts
421-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
422+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
423 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
424 #?XSERVER-0 ACCEPT-CONNECT
425 #?SESSION-X-0 CONNECT-XSERVER
426
427=== modified file 'tests/scripts/lock-seat-return-session-console-kit.conf'
428--- tests/scripts/lock-seat-return-session-console-kit.conf 2014-03-17 18:33:02 +0000
429+++ tests/scripts/lock-seat-return-session-console-kit.conf 2014-04-03 20:07:08 +0000
430@@ -21,7 +21,7 @@
431 #?XSERVER-0 ACCEPT-CONNECT
432
433 # Session starts
434-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
435+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
436 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
437 #?XSERVER-0 ACCEPT-CONNECT
438 #?SESSION-X-0 CONNECT-XSERVER
439
440=== modified file 'tests/scripts/lock-seat-return-session.conf'
441--- tests/scripts/lock-seat-return-session.conf 2014-03-17 18:33:02 +0000
442+++ tests/scripts/lock-seat-return-session.conf 2014-04-03 20:07:08 +0000
443@@ -18,7 +18,7 @@
444 #?XSERVER-0 ACCEPT-CONNECT
445
446 # Session starts
447-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
448+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
449 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
450 #?XSERVER-0 ACCEPT-CONNECT
451 #?SESSION-X-0 CONNECT-XSERVER
452
453=== modified file 'tests/scripts/lock-seat.conf'
454--- tests/scripts/lock-seat.conf 2014-03-17 18:33:02 +0000
455+++ tests/scripts/lock-seat.conf 2014-04-03 20:07:08 +0000
456@@ -18,7 +18,7 @@
457 #?XSERVER-0 ACCEPT-CONNECT
458
459 # Session starts
460-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
461+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
462 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
463 #?XSERVER-0 ACCEPT-CONNECT
464 #?SESSION-X-0 CONNECT-XSERVER
465
466=== modified file 'tests/scripts/lock-session-no-password.conf'
467--- tests/scripts/lock-session-no-password.conf 2014-03-17 18:33:02 +0000
468+++ tests/scripts/lock-session-no-password.conf 2014-04-03 20:07:08 +0000
469@@ -18,7 +18,7 @@
470 #?XSERVER-0 ACCEPT-CONNECT
471
472 # Session starts
473-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
474+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
475 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
476 #?XSERVER-0 ACCEPT-CONNECT
477 #?SESSION-X-0 CONNECT-XSERVER
478
479=== modified file 'tests/scripts/lock-session-return-session.conf'
480--- tests/scripts/lock-session-return-session.conf 2014-03-17 18:33:02 +0000
481+++ tests/scripts/lock-session-return-session.conf 2014-04-03 20:07:08 +0000
482@@ -18,7 +18,7 @@
483 #?XSERVER-0 ACCEPT-CONNECT
484
485 # Session starts
486-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
487+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
488 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
489 #?XSERVER-0 ACCEPT-CONNECT
490 #?SESSION-X-0 CONNECT-XSERVER
491
492=== modified file 'tests/scripts/lock-session.conf'
493--- tests/scripts/lock-session.conf 2014-03-17 18:33:02 +0000
494+++ tests/scripts/lock-session.conf 2014-04-03 20:07:08 +0000
495@@ -18,7 +18,7 @@
496 #?XSERVER-0 ACCEPT-CONNECT
497
498 # Session starts
499-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
500+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
501 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
502 #?XSERVER-0 ACCEPT-CONNECT
503 #?SESSION-X-0 CONNECT-XSERVER
504
505=== modified file 'tests/scripts/login-guest-logout.conf'
506--- tests/scripts/login-guest-logout.conf 2014-03-17 18:33:02 +0000
507+++ tests/scripts/login-guest-logout.conf 2014-04-03 20:07:08 +0000
508@@ -34,7 +34,7 @@
509 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
510
511 # Guest session starts
512-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
513+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
514 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
515 #?XSERVER-0 ACCEPT-CONNECT
516 #?SESSION-X-0 CONNECT-XSERVER
517
518=== modified file 'tests/scripts/login-guest-pick-session.conf'
519--- tests/scripts/login-guest-pick-session.conf 2014-03-17 18:33:02 +0000
520+++ tests/scripts/login-guest-pick-session.conf 2014-04-03 20:07:08 +0000
521@@ -34,7 +34,7 @@
522 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
523
524 # Guest session starts
525-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
526+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
527 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
528 #?XSERVER-0 ACCEPT-CONNECT
529 #?SESSION-X-0 CONNECT-XSERVER
530
531=== modified file 'tests/scripts/login-guest-session-config.conf'
532--- tests/scripts/login-guest-session-config.conf 2014-03-17 18:33:02 +0000
533+++ tests/scripts/login-guest-session-config.conf 2014-04-03 20:07:08 +0000
534@@ -35,7 +35,7 @@
535 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
536
537 # Guest session starts
538-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=alternative NAME=alternative USER=guest-.*
539+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=guest-.*
540 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
541 #?XSERVER-0 ACCEPT-CONNECT
542 #?SESSION-X-0 CONNECT-XSERVER
543
544=== modified file 'tests/scripts/login-guest.conf'
545--- tests/scripts/login-guest.conf 2014-03-17 18:33:02 +0000
546+++ tests/scripts/login-guest.conf 2014-04-03 20:07:08 +0000
547@@ -34,7 +34,7 @@
548 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
549
550 # Guest session starts
551-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
552+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
553 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
554 #?XSERVER-0 ACCEPT-CONNECT
555 #?SESSION-X-0 CONNECT-XSERVER
556
557=== modified file 'tests/scripts/login-logout.conf'
558--- tests/scripts/login-logout.conf 2014-03-17 18:33:02 +0000
559+++ tests/scripts/login-logout.conf 2014-04-03 20:07:08 +0000
560@@ -33,7 +33,7 @@
561 #?GREETER-X-0 TERMINATE SIGNAL=15
562
563 # Session starts
564-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
565+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
566 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
567 #?XSERVER-0 ACCEPT-CONNECT
568 #?SESSION-X-0 CONNECT-XSERVER
569
570=== modified file 'tests/scripts/login-manual-previous-session.conf'
571--- tests/scripts/login-manual-previous-session.conf 2014-03-17 18:33:02 +0000
572+++ tests/scripts/login-manual-previous-session.conf 2014-04-03 20:07:08 +0000
573@@ -30,7 +30,7 @@
574 #?GREETER-X-0 TERMINATE SIGNAL=15
575
576 # Session starts
577-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
578+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
579 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
580 #?XSERVER-0 ACCEPT-CONNECT
581 #?SESSION-X-0 CONNECT-XSERVER
582
583=== modified file 'tests/scripts/login-manual-remember-session.conf'
584--- tests/scripts/login-manual-remember-session.conf 2014-03-17 18:33:02 +0000
585+++ tests/scripts/login-manual-remember-session.conf 2014-04-03 20:07:08 +0000
586@@ -30,7 +30,7 @@
587 #?GREETER-X-0 TERMINATE SIGNAL=15
588
589 # Session starts
590-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
591+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
592 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
593 #?XSERVER-0 ACCEPT-CONNECT
594 #?SESSION-X-0 CONNECT-XSERVER
595@@ -66,7 +66,7 @@
596 #?GREETER-X-0 TERMINATE SIGNAL=15
597
598 # Session starts
599-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
600+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
601 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
602 #?XSERVER-0 ACCEPT-CONNECT
603 #?SESSION-X-0 CONNECT-XSERVER
604
605=== modified file 'tests/scripts/login-manual.conf'
606--- tests/scripts/login-manual.conf 2014-03-17 18:33:02 +0000
607+++ tests/scripts/login-manual.conf 2014-04-03 20:07:08 +0000
608@@ -35,7 +35,7 @@
609 #?GREETER-X-0 TERMINATE SIGNAL=15
610
611 # Session starts
612-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
613+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
614 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
615 #?XSERVER-0 ACCEPT-CONNECT
616 #?SESSION-X-0 CONNECT-XSERVER
617
618=== modified file 'tests/scripts/login-new-authtok.conf'
619--- tests/scripts/login-new-authtok.conf 2014-03-17 18:33:02 +0000
620+++ tests/scripts/login-new-authtok.conf 2014-04-03 20:07:08 +0000
621@@ -33,7 +33,7 @@
622 #?GREETER-X-0 TERMINATE SIGNAL=15
623
624 # Session starts
625-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok DESKTOP_SESSION=default USER=new-authtok
626+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/new-authtok XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=new-authtok
627 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
628 #?XSERVER-0 ACCEPT-CONNECT
629 #?SESSION-X-0 CONNECT-XSERVER
630
631=== modified file 'tests/scripts/login-no-password.conf'
632--- tests/scripts/login-no-password.conf 2014-03-17 18:33:02 +0000
633+++ tests/scripts/login-no-password.conf 2014-04-03 20:07:08 +0000
634@@ -31,7 +31,7 @@
635 #?GREETER-X-0 TERMINATE SIGNAL=15
636
637 # Session starts
638-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
639+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
640 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
641 #?XSERVER-0 ACCEPT-CONNECT
642 #?SESSION-X-0 CONNECT-XSERVER
643
644=== modified file 'tests/scripts/login-pam.conf'
645--- tests/scripts/login-pam.conf 2014-03-17 18:33:02 +0000
646+++ tests/scripts/login-pam.conf 2014-04-03 20:07:08 +0000
647@@ -35,7 +35,7 @@
648 #?GREETER-X-0 TERMINATE SIGNAL=15
649
650 # Session starts
651-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
652+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=log-pam
653 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
654 #?XSERVER-0 ACCEPT-CONNECT
655 #?SESSION-X-0 CONNECT-XSERVER
656
657=== modified file 'tests/scripts/login-pick-session.conf'
658--- tests/scripts/login-pick-session.conf 2014-03-17 18:33:02 +0000
659+++ tests/scripts/login-pick-session.conf 2014-04-03 20:07:08 +0000
660@@ -28,7 +28,7 @@
661 #?GREETER-X-0 TERMINATE SIGNAL=15
662
663 # Session starts
664-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
665+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
666 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
667 #?XSERVER-0 ACCEPT-CONNECT
668 #?SESSION-X-0 CONNECT-XSERVER
669
670=== modified file 'tests/scripts/login-previous-session.conf'
671--- tests/scripts/login-previous-session.conf 2014-03-17 18:33:02 +0000
672+++ tests/scripts/login-previous-session.conf 2014-04-03 20:07:08 +0000
673@@ -28,7 +28,7 @@
674 #?GREETER-X-0 TERMINATE SIGNAL=15
675
676 # Session starts
677-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session DESKTOP_SESSION=alternative NAME=alternative USER=have-session
678+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-session XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=have-session
679 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
680 #?XSERVER-0 ACCEPT-CONNECT
681 #?SESSION-X-0 CONNECT-XSERVER
682
683=== modified file 'tests/scripts/login-remember-session.conf'
684--- tests/scripts/login-remember-session.conf 2014-03-17 18:33:02 +0000
685+++ tests/scripts/login-remember-session.conf 2014-04-03 20:07:08 +0000
686@@ -28,7 +28,7 @@
687 #?GREETER-X-0 TERMINATE SIGNAL=15
688
689 # Session starts
690-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
691+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
692 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
693 #?XSERVER-0 ACCEPT-CONNECT
694 #?SESSION-X-0 CONNECT-XSERVER
695@@ -62,7 +62,7 @@
696 #?GREETER-X-0 TERMINATE SIGNAL=15
697
698 # Session starts
699-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=alternative NAME=alternative USER=no-password1
700+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=no-password1
701 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
702 #?XSERVER-0 ACCEPT-CONNECT
703 #?SESSION-X-0 CONNECT-XSERVER
704
705=== modified file 'tests/scripts/login-remote-session.conf'
706--- tests/scripts/login-remote-session.conf 2014-03-17 18:33:02 +0000
707+++ tests/scripts/login-remote-session.conf 2014-04-03 20:07:08 +0000
708@@ -37,7 +37,7 @@
709 #?GREETER-X-0 TERMINATE SIGNAL=15
710
711 # Session starts
712-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=test-remote USER=guest-.*
713+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_DESKTOP=test-remote USER=guest-.*
714 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
715 #?XSERVER-0 ACCEPT-CONNECT
716 #?SESSION-X-0 CONNECT-XSERVER
717
718=== modified file 'tests/scripts/login-session-crash.conf'
719--- tests/scripts/login-session-crash.conf 2014-03-17 18:33:02 +0000
720+++ tests/scripts/login-session-crash.conf 2014-04-03 20:07:08 +0000
721@@ -33,7 +33,7 @@
722 #?GREETER-X-0 TERMINATE SIGNAL=15
723
724 # Session starts
725-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
726+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
727 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
728 #?XSERVER-0 ACCEPT-CONNECT
729 #?SESSION-X-0 CONNECT-XSERVER
730
731=== modified file 'tests/scripts/login-xserver-crash.conf'
732--- tests/scripts/login-xserver-crash.conf 2014-03-17 18:33:02 +0000
733+++ tests/scripts/login-xserver-crash.conf 2014-04-03 20:07:08 +0000
734@@ -33,7 +33,7 @@
735 #?GREETER-X-0 TERMINATE SIGNAL=15
736
737 # Session starts
738-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
739+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
740 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
741 #?XSERVER-0 ACCEPT-CONNECT
742 #?SESSION-X-0 CONNECT-XSERVER
743
744=== modified file 'tests/scripts/login.conf'
745--- tests/scripts/login.conf 2014-03-17 18:33:02 +0000
746+++ tests/scripts/login.conf 2014-04-03 20:07:08 +0000
747@@ -33,7 +33,7 @@
748 #?GREETER-X-0 TERMINATE SIGNAL=15
749
750 # Session starts
751-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
752+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
753 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
754 #?XSERVER-0 ACCEPT-CONNECT
755 #?SESSION-X-0 CONNECT-XSERVER
756
757=== modified file 'tests/scripts/mir-autologin.conf'
758--- tests/scripts/mir-autologin.conf 2014-03-19 21:29:07 +0000
759+++ tests/scripts/mir-autologin.conf 2014-04-03 20:07:08 +0000
760@@ -14,7 +14,7 @@
761 #?*UNITY-SYSTEM-COMPOSITOR READY
762
763 # Session starts
764-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
765+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
766 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
767
768 # Cleanup
769
770=== modified file 'tests/scripts/mir-session-compositor-crash.conf'
771--- tests/scripts/mir-session-compositor-crash.conf 2014-03-19 21:29:07 +0000
772+++ tests/scripts/mir-session-compositor-crash.conf 2014-04-03 20:07:08 +0000
773@@ -14,7 +14,7 @@
774 #?*UNITY-SYSTEM-COMPOSITOR READY
775
776 # Session starts
777-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
778+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
779 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
780
781 # Crash system compositor
782
783=== modified file 'tests/scripts/mir-session-crash.conf'
784--- tests/scripts/mir-session-crash.conf 2014-03-19 21:29:07 +0000
785+++ tests/scripts/mir-session-crash.conf 2014-04-03 20:07:08 +0000
786@@ -14,7 +14,7 @@
787 #?*UNITY-SYSTEM-COMPOSITOR READY
788
789 # Session starts
790-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
791+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
792 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
793
794 # Crash session
795
796=== modified file 'tests/scripts/mir-session.conf'
797--- tests/scripts/mir-session.conf 2014-03-19 21:29:07 +0000
798+++ tests/scripts/mir-session.conf 2014-04-03 20:07:08 +0000
799@@ -41,7 +41,7 @@
800 #?XSERVER-0 TERMINATE SIGNAL=15
801
802 # Session starts
803-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
804+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
805 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
806
807 # Cleanup
808
809=== modified file 'tests/scripts/no-accounts-service.conf'
810--- tests/scripts/no-accounts-service.conf 2014-03-17 18:33:02 +0000
811+++ tests/scripts/no-accounts-service.conf 2014-04-03 20:07:08 +0000
812@@ -21,7 +21,7 @@
813 #?XSERVER-0 ACCEPT-CONNECT
814
815 # Session starts
816-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
817+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
818 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
819 #?XSERVER-0 ACCEPT-CONNECT
820 #?SESSION-X-0 CONNECT-XSERVER
821
822=== modified file 'tests/scripts/no-console-kit-or-login1.conf'
823--- tests/scripts/no-console-kit-or-login1.conf 2014-02-25 04:01:50 +0000
824+++ tests/scripts/no-console-kit-or-login1.conf 2014-04-03 20:07:08 +0000
825@@ -22,7 +22,7 @@
826 #?XSERVER-0 ACCEPT-CONNECT
827
828 # Session starts
829-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
830+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
831 #?XSERVER-0 ACCEPT-CONNECT
832 #?SESSION-X-0 CONNECT-XSERVER
833
834
835=== modified file 'tests/scripts/no-console-kit.conf'
836--- tests/scripts/no-console-kit.conf 2014-03-17 18:33:02 +0000
837+++ tests/scripts/no-console-kit.conf 2014-04-03 20:07:08 +0000
838@@ -21,7 +21,7 @@
839 #?XSERVER-0 ACCEPT-CONNECT
840
841 # Session starts
842-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
843+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
844 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
845 #?XSERVER-0 ACCEPT-CONNECT
846 #?SESSION-X-0 CONNECT-XSERVER
847
848=== modified file 'tests/scripts/no-login1.conf'
849--- tests/scripts/no-login1.conf 2014-03-17 18:33:02 +0000
850+++ tests/scripts/no-login1.conf 2014-04-03 20:07:08 +0000
851@@ -21,7 +21,7 @@
852 #?XSERVER-0 ACCEPT-CONNECT
853
854 # Session starts
855-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 DESKTOP_SESSION=default USER=have-password1
856+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_COOKIE=ck-cookie-x:0 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
857 #?CONSOLE-KIT ACTIVATE-SESSION SESSION=ck-cookie-x:0
858 #?XSERVER-0 ACCEPT-CONNECT
859 #?SESSION-X-0 CONNECT-XSERVER
860
861=== modified file 'tests/scripts/open-file-descriptors.conf'
862--- tests/scripts/open-file-descriptors.conf 2014-03-17 18:33:02 +0000
863+++ tests/scripts/open-file-descriptors.conf 2014-04-03 20:07:08 +0000
864@@ -34,7 +34,7 @@
865 #?GREETER-X-0 TERMINATE SIGNAL=15
866
867 # Session starts
868-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
869+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
870 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
871 #?XSERVER-0 ACCEPT-CONNECT
872 #?SESSION-X-0 CONNECT-XSERVER
873
874=== modified file 'tests/scripts/pam.conf'
875--- tests/scripts/pam.conf 2014-03-17 18:33:02 +0000
876+++ tests/scripts/pam.conf 2014-04-03 20:07:08 +0000
877@@ -18,7 +18,7 @@
878 #?XSERVER-0 ACCEPT-CONNECT
879
880 # Session starts
881-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam DESKTOP_SESSION=default USER=log-pam
882+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/log-pam XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=log-pam
883 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
884 #?XSERVER-0 ACCEPT-CONNECT
885 #?SESSION-X-0 CONNECT-XSERVER
886
887=== modified file 'tests/scripts/script-hooks.conf'
888--- tests/scripts/script-hooks.conf 2014-03-17 18:33:02 +0000
889+++ tests/scripts/script-hooks.conf 2014-04-03 20:07:08 +0000
890@@ -27,7 +27,7 @@
891 #?SCRIPT-HOOK SESSION-SETUP USER=have-password1
892
893 # Session starts
894-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
895+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
896 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
897 #?XSERVER-0 ACCEPT-CONNECT
898 #?SESSION-X-0 CONNECT-XSERVER
899
900=== modified file 'tests/scripts/session-stderr-backup.conf'
901--- tests/scripts/session-stderr-backup.conf 2014-03-17 18:33:02 +0000
902+++ tests/scripts/session-stderr-backup.conf 2014-04-03 20:07:08 +0000
903@@ -18,7 +18,7 @@
904 #?XSERVER-0 ACCEPT-CONNECT
905
906 # Session starts
907-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
908+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
909 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
910 #?XSERVER-0 ACCEPT-CONNECT
911 #?SESSION-X-0 CONNECT-XSERVER
912@@ -45,7 +45,7 @@
913 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
914 #?*GREETER-X-0 START-SESSION
915 #?GREETER-X-0 TERMINATE SIGNAL=15
916-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
917+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
918 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
919 #?XSERVER-0 ACCEPT-CONNECT
920 #?SESSION-X-0 CONNECT-XSERVER
921@@ -76,7 +76,7 @@
922 #?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=no-password1 AUTHENTICATED=TRUE
923 #?*GREETER-X-0 START-SESSION
924 #?GREETER-X-0 TERMINATE SIGNAL=15
925-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
926+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
927 #?LOGIN1 ACTIVATE-SESSION SESSION=c4
928 #?XSERVER-0 ACCEPT-CONNECT
929 #?SESSION-X-0 CONNECT-XSERVER
930
931=== modified file 'tests/scripts/session-stderr-multi-write.conf'
932--- tests/scripts/session-stderr-multi-write.conf 2014-03-17 18:33:02 +0000
933+++ tests/scripts/session-stderr-multi-write.conf 2014-04-03 20:07:08 +0000
934@@ -18,7 +18,7 @@
935 #?XSERVER-0 ACCEPT-CONNECT
936
937 # Session starts
938-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
939+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
940 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
941 #?XSERVER-0 ACCEPT-CONNECT
942 #?SESSION-X-0 CONNECT-XSERVER
943
944=== modified file 'tests/scripts/session-stderr.conf'
945--- tests/scripts/session-stderr.conf 2014-03-17 18:33:02 +0000
946+++ tests/scripts/session-stderr.conf 2014-04-03 20:07:08 +0000
947@@ -18,7 +18,7 @@
948 #?XSERVER-0 ACCEPT-CONNECT
949
950 # Session starts
951-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
952+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
953 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
954 #?XSERVER-0 ACCEPT-CONNECT
955 #?SESSION-X-0 CONNECT-XSERVER
956
957=== modified file 'tests/scripts/session-stdout.conf'
958--- tests/scripts/session-stdout.conf 2014-03-17 18:33:02 +0000
959+++ tests/scripts/session-stdout.conf 2014-04-03 20:07:08 +0000
960@@ -18,7 +18,7 @@
961 #?XSERVER-0 ACCEPT-CONNECT
962
963 # Session starts
964-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
965+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
966 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
967 #?XSERVER-0 ACCEPT-CONNECT
968 #?SESSION-X-0 CONNECT-XSERVER
969
970=== modified file 'tests/scripts/shared-data-greeter-to-session.conf'
971--- tests/scripts/shared-data-greeter-to-session.conf 2014-03-17 18:33:02 +0000
972+++ tests/scripts/shared-data-greeter-to-session.conf 2014-04-03 20:07:08 +0000
973@@ -35,7 +35,7 @@
974 #?GREETER-X-0 TERMINATE SIGNAL=15
975
976 # Session starts
977-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
978+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
979 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
980 #?XSERVER-0 ACCEPT-CONNECT
981 #?SESSION-X-0 CONNECT-XSERVER
982
983=== modified file 'tests/scripts/shared-data-session-to-greeter-autologin.conf'
984--- tests/scripts/shared-data-session-to-greeter-autologin.conf 2014-03-17 18:33:02 +0000
985+++ tests/scripts/shared-data-session-to-greeter-autologin.conf 2014-04-03 20:07:08 +0000
986@@ -18,7 +18,7 @@
987 #?XSERVER-0 ACCEPT-CONNECT
988
989 # Session starts
990-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
991+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
992 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
993 #?XSERVER-0 ACCEPT-CONNECT
994 #?SESSION-X-0 CONNECT-XSERVER
995
996=== modified file 'tests/scripts/shared-data-session-to-greeter.conf'
997--- tests/scripts/shared-data-session-to-greeter.conf 2014-03-17 18:33:02 +0000
998+++ tests/scripts/shared-data-session-to-greeter.conf 2014-04-03 20:07:08 +0000
999@@ -31,7 +31,7 @@
1000 #?GREETER-X-0 TERMINATE SIGNAL=15
1001
1002 # Session starts
1003-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1004+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1005 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1006 #?XSERVER-0 ACCEPT-CONNECT
1007 #?SESSION-X-0 CONNECT-XSERVER
1008
1009=== modified file 'tests/scripts/surfaceflinger-autologin.conf'
1010--- tests/scripts/surfaceflinger-autologin.conf 2014-03-17 18:33:02 +0000
1011+++ tests/scripts/surfaceflinger-autologin.conf 2014-04-03 20:07:08 +0000
1012@@ -11,7 +11,7 @@
1013 #?RUNNER DAEMON-START
1014
1015 # Session starts (test session doesn't know it's in surfaceflinger)
1016-#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=surfaceflinger USER=have-password1
1017+#?SESSION-UNKNOWN START XDG_SEAT=seat0 XDG_VTNR=1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_DESKTOP=surfaceflinger USER=have-password1
1018 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1019
1020 # Cleanup
1021
1022=== modified file 'tests/scripts/switch-to-greeter-new-session.conf'
1023--- tests/scripts/switch-to-greeter-new-session.conf 2014-03-17 18:33:02 +0000
1024+++ tests/scripts/switch-to-greeter-new-session.conf 2014-04-03 20:07:08 +0000
1025@@ -18,7 +18,7 @@
1026 #?XSERVER-0 ACCEPT-CONNECT
1027
1028 # Session starts
1029-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1030+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1031 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1032 #?XSERVER-0 ACCEPT-CONNECT
1033 #?SESSION-X-0 CONNECT-XSERVER
1034@@ -58,7 +58,7 @@
1035 #?GREETER-X-1 TERMINATE SIGNAL=15
1036
1037 # New session starts
1038-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
1039+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
1040 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
1041 #?XSERVER-1 ACCEPT-CONNECT
1042 #?SESSION-X-1 CONNECT-XSERVER
1043
1044=== modified file 'tests/scripts/switch-to-greeter-return-session-logout.conf'
1045--- tests/scripts/switch-to-greeter-return-session-logout.conf 2014-03-17 18:33:02 +0000
1046+++ tests/scripts/switch-to-greeter-return-session-logout.conf 2014-04-03 20:07:08 +0000
1047@@ -18,7 +18,7 @@
1048 #?XSERVER-0 ACCEPT-CONNECT
1049
1050 # Session starts
1051-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1052+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1053 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1054 #?XSERVER-0 ACCEPT-CONNECT
1055 #?SESSION-X-0 CONNECT-XSERVER
1056
1057=== modified file 'tests/scripts/switch-to-greeter-return-session.conf'
1058--- tests/scripts/switch-to-greeter-return-session.conf 2014-03-17 18:33:02 +0000
1059+++ tests/scripts/switch-to-greeter-return-session.conf 2014-04-03 20:07:08 +0000
1060@@ -18,7 +18,7 @@
1061 #?XSERVER-0 ACCEPT-CONNECT
1062
1063 # Session starts
1064-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1065+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1066 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1067 #?XSERVER-0 ACCEPT-CONNECT
1068 #?SESSION-X-0 CONNECT-XSERVER
1069
1070=== modified file 'tests/scripts/switch-to-greeter.conf'
1071--- tests/scripts/switch-to-greeter.conf 2014-03-17 18:33:02 +0000
1072+++ tests/scripts/switch-to-greeter.conf 2014-04-03 20:07:08 +0000
1073@@ -18,7 +18,7 @@
1074 #?XSERVER-0 ACCEPT-CONNECT
1075
1076 # Session starts
1077-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1078+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1079 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1080 #?XSERVER-0 ACCEPT-CONNECT
1081 #?SESSION-X-0 CONNECT-XSERVER
1082
1083=== modified file 'tests/scripts/switch-to-guest.conf'
1084--- tests/scripts/switch-to-guest.conf 2014-03-17 18:33:02 +0000
1085+++ tests/scripts/switch-to-guest.conf 2014-04-03 20:07:08 +0000
1086@@ -19,7 +19,7 @@
1087 #?XSERVER-0 ACCEPT-CONNECT
1088
1089 # Default session starts
1090-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1091+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1092 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1093 #?XSERVER-0 ACCEPT-CONNECT
1094 #?SESSION-X-0 CONNECT-XSERVER
1095@@ -43,7 +43,7 @@
1096 #?GUEST-ACCOUNT ADD USERNAME=guest-.*
1097
1098 # Guest session starts
1099-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* DESKTOP_SESSION=default USER=guest-.*
1100+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/guest-.* XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=guest-.*
1101 #?XSERVER-1 ACCEPT-CONNECT
1102 #?SESSION-X-1 CONNECT-XSERVER
1103
1104
1105=== modified file 'tests/scripts/switch-to-user-active.conf'
1106--- tests/scripts/switch-to-user-active.conf 2014-03-17 18:33:02 +0000
1107+++ tests/scripts/switch-to-user-active.conf 2014-04-03 20:07:08 +0000
1108@@ -19,7 +19,7 @@
1109 #?XSERVER-0 ACCEPT-CONNECT
1110
1111 # Session starts
1112-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1113+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1114 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1115 #?XSERVER-0 ACCEPT-CONNECT
1116 #?SESSION-X-0 CONNECT-XSERVER
1117
1118=== modified file 'tests/scripts/switch-to-user-existing-no-password.conf'
1119--- tests/scripts/switch-to-user-existing-no-password.conf 2014-03-17 18:33:02 +0000
1120+++ tests/scripts/switch-to-user-existing-no-password.conf 2014-04-03 20:07:08 +0000
1121@@ -19,7 +19,7 @@
1122 #?XSERVER-0 ACCEPT-CONNECT
1123
1124 # Session starts
1125-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1126+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1127 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1128 #?XSERVER-0 ACCEPT-CONNECT
1129 #?SESSION-X-0 CONNECT-XSERVER
1130@@ -40,7 +40,7 @@
1131 #?LOGIN1 LOCK-SESSION
1132
1133 # New session starts
1134-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
1135+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
1136 #?XSERVER-1 ACCEPT-CONNECT
1137 #?SESSION-X-1 CONNECT-XSERVER
1138
1139
1140=== modified file 'tests/scripts/switch-to-user-existing.conf'
1141--- tests/scripts/switch-to-user-existing.conf 2014-03-17 18:33:02 +0000
1142+++ tests/scripts/switch-to-user-existing.conf 2014-04-03 20:07:08 +0000
1143@@ -19,7 +19,7 @@
1144 #?XSERVER-0 ACCEPT-CONNECT
1145
1146 # Session starts
1147-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1148+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1149 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1150 #?XSERVER-0 ACCEPT-CONNECT
1151 #?SESSION-X-0 CONNECT-XSERVER
1152@@ -40,7 +40,7 @@
1153 #?LOGIN1 LOCK-SESSION
1154
1155 # New session starts
1156-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1157+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1158 #?XSERVER-1 ACCEPT-CONNECT
1159 #?SESSION-X-1 CONNECT-XSERVER
1160
1161
1162=== modified file 'tests/scripts/switch-to-user-logout-active.conf'
1163--- tests/scripts/switch-to-user-logout-active.conf 2014-03-17 18:33:02 +0000
1164+++ tests/scripts/switch-to-user-logout-active.conf 2014-04-03 20:07:08 +0000
1165@@ -19,7 +19,7 @@
1166 #?XSERVER-0 ACCEPT-CONNECT
1167
1168 # Session starts
1169-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1170+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1171 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1172 #?XSERVER-0 ACCEPT-CONNECT
1173 #?SESSION-X-0 CONNECT-XSERVER
1174@@ -40,7 +40,7 @@
1175 #?LOGIN1 LOCK-SESSION
1176
1177 # Session starts
1178-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
1179+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
1180 #?XSERVER-1 ACCEPT-CONNECT
1181 #?SESSION-X-1 CONNECT-XSERVER
1182
1183
1184=== modified file 'tests/scripts/switch-to-user-logout-inactive.conf'
1185--- tests/scripts/switch-to-user-logout-inactive.conf 2014-03-17 18:33:02 +0000
1186+++ tests/scripts/switch-to-user-logout-inactive.conf 2014-04-03 20:07:08 +0000
1187@@ -19,7 +19,7 @@
1188 #?XSERVER-0 ACCEPT-CONNECT
1189
1190 # Session starts
1191-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1192+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1193 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1194 #?XSERVER-0 ACCEPT-CONNECT
1195 #?SESSION-X-0 CONNECT-XSERVER
1196@@ -40,7 +40,7 @@
1197 #?LOGIN1 LOCK-SESSION
1198
1199 # Session starts
1200-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
1201+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
1202 #?XSERVER-1 ACCEPT-CONNECT
1203 #?SESSION-X-1 CONNECT-XSERVER
1204
1205
1206=== modified file 'tests/scripts/switch-to-user-no-password.conf'
1207--- tests/scripts/switch-to-user-no-password.conf 2014-03-17 18:33:02 +0000
1208+++ tests/scripts/switch-to-user-no-password.conf 2014-04-03 20:07:08 +0000
1209@@ -19,7 +19,7 @@
1210 #?XSERVER-0 ACCEPT-CONNECT
1211
1212 # Session starts
1213-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1214+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1215 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1216 #?XSERVER-0 ACCEPT-CONNECT
1217 #?SESSION-X-0 CONNECT-XSERVER
1218@@ -40,7 +40,7 @@
1219 #?LOGIN1 LOCK-SESSION
1220
1221 # New session starts
1222-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1223+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1224 #?XSERVER-1 ACCEPT-CONNECT
1225 #?SESSION-X-1 CONNECT-XSERVER
1226
1227
1228=== modified file 'tests/scripts/switch-to-user.conf'
1229--- tests/scripts/switch-to-user.conf 2014-03-17 18:33:02 +0000
1230+++ tests/scripts/switch-to-user.conf 2014-04-03 20:07:08 +0000
1231@@ -19,7 +19,7 @@
1232 #?XSERVER-0 ACCEPT-CONNECT
1233
1234 # Session starts
1235-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1236+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1237 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1238 #?XSERVER-0 ACCEPT-CONNECT
1239 #?SESSION-X-0 CONNECT-XSERVER
1240
1241=== modified file 'tests/scripts/switch-to-users.conf'
1242--- tests/scripts/switch-to-users.conf 2014-03-17 18:33:02 +0000
1243+++ tests/scripts/switch-to-users.conf 2014-04-03 20:07:08 +0000
1244@@ -19,7 +19,7 @@
1245 #?XSERVER-0 ACCEPT-CONNECT
1246
1247 # Session starts
1248-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1249+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1250 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1251 #?XSERVER-0 ACCEPT-CONNECT
1252 #?SESSION-X-0 CONNECT-XSERVER
1253@@ -40,7 +40,7 @@
1254 #?LOGIN1 LOCK-SESSION
1255
1256 # New session starts
1257-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1258+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1259 #?XSERVER-1 ACCEPT-CONNECT
1260 #?SESSION-X-1 CONNECT-XSERVER
1261
1262@@ -64,7 +64,7 @@
1263 #?LOGIN1 LOCK-SESSION
1264
1265 # New session starts
1266-#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 DESKTOP_SESSION=default USER=no-password2
1267+#?SESSION-X-2 START XDG_SEAT=seat0 XDG_VTNR=9 XDG_GREETER_DATA_DIR=.*/no-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password2
1268 #?XSERVER-2 ACCEPT-CONNECT
1269 #?SESSION-X-2 CONNECT-XSERVER
1270
1271
1272=== modified file 'tests/scripts/system-xauthority.conf'
1273--- tests/scripts/system-xauthority.conf 2014-03-17 18:33:02 +0000
1274+++ tests/scripts/system-xauthority.conf 2014-04-03 20:07:08 +0000
1275@@ -21,7 +21,7 @@
1276 #?XSERVER-0 ACCEPT-CONNECT
1277
1278 # Session starts
1279-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1280+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1281 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1282 #?XSERVER-0 ACCEPT-CONNECT
1283 #?SESSION-X-0 CONNECT-XSERVER
1284
1285=== modified file 'tests/scripts/unity-autologin.conf'
1286--- tests/scripts/unity-autologin.conf 2014-03-17 18:33:02 +0000
1287+++ tests/scripts/unity-autologin.conf 2014-04-03 20:07:08 +0000
1288@@ -23,7 +23,7 @@
1289 #?XSERVER-0 ACCEPT-CONNECT
1290
1291 # Session starts
1292-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1293+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1294 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1295 #?XSERVER-0 ACCEPT-CONNECT
1296 #?SESSION-X-0 CONNECT-XSERVER
1297
1298=== modified file 'tests/scripts/unity-compositor-mir-next-session.conf'
1299--- tests/scripts/unity-compositor-mir-next-session.conf 2014-03-17 18:33:02 +0000
1300+++ tests/scripts/unity-compositor-mir-next-session.conf 2014-04-03 20:07:08 +0000
1301@@ -22,7 +22,7 @@
1302 #?GREETER-MIR-greeter-0 CONNECTED-TO-DAEMON
1303
1304 # Background session
1305-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=mir USER=have-password2
1306+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password2
1307 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1308
1309 # System compositor switches to greeter
1310
1311=== modified file 'tests/scripts/unity-compositor-next-session.conf'
1312--- tests/scripts/unity-compositor-next-session.conf 2014-03-17 18:33:02 +0000
1313+++ tests/scripts/unity-compositor-next-session.conf 2014-04-03 20:07:08 +0000
1314@@ -32,7 +32,7 @@
1315 #?*XSERVER-1 INDICATE-READY
1316 #?XSERVER-1 INDICATE-READY
1317 #?XSERVER-1 ACCEPT-CONNECT
1318-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
1319+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
1320 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1321 #?XSERVER-1 ACCEPT-CONNECT
1322 #?SESSION-X-1 CONNECT-XSERVER
1323
1324=== modified file 'tests/scripts/unity-login.conf'
1325--- tests/scripts/unity-login.conf 2014-03-17 18:33:02 +0000
1326+++ tests/scripts/unity-login.conf 2014-04-03 20:07:08 +0000
1327@@ -41,7 +41,7 @@
1328 #?GREETER-X-0 TERMINATE SIGNAL=15
1329
1330 # Session starts
1331-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1332+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1333 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1334 #?XSERVER-0 ACCEPT-CONNECT
1335 #?SESSION-X-0 CONNECT-XSERVER
1336
1337=== modified file 'tests/scripts/unity-mir-autologin.conf'
1338--- tests/scripts/unity-mir-autologin.conf 2014-03-17 18:33:02 +0000
1339+++ tests/scripts/unity-mir-autologin.conf 2014-04-03 20:07:08 +0000
1340@@ -15,7 +15,7 @@
1341 #?*UNITY-SYSTEM-COMPOSITOR READY
1342
1343 # Session starts
1344-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
1345+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
1346 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1347
1348 # System compositor switches to session
1349
1350=== modified file 'tests/scripts/unity-mir-greeter-mir-session.conf'
1351--- tests/scripts/unity-mir-greeter-mir-session.conf 2014-03-17 18:33:02 +0000
1352+++ tests/scripts/unity-mir-greeter-mir-session.conf 2014-04-03 20:07:08 +0000
1353@@ -28,7 +28,7 @@
1354 #?*GREETER-MIR-greeter-0 START-SESSION
1355
1356 # Session starts
1357-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
1358+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
1359 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1360
1361 # System compositor switches to session
1362
1363=== modified file 'tests/scripts/unity-mir-greeter-x-session.conf'
1364--- tests/scripts/unity-mir-greeter-x-session.conf 2014-03-17 18:33:02 +0000
1365+++ tests/scripts/unity-mir-greeter-x-session.conf 2014-04-03 20:07:08 +0000
1366@@ -36,7 +36,7 @@
1367 #?XSERVER-0 ACCEPT-CONNECT
1368
1369 # Session starts
1370-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=default USER=no-password1
1371+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=no-password1
1372 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1373 #?XSERVER-0 ACCEPT-CONNECT
1374 #?SESSION-X-0 CONNECT-XSERVER
1375
1376=== modified file 'tests/scripts/unity-mir-lock-seat.conf'
1377--- tests/scripts/unity-mir-lock-seat.conf 2014-03-17 18:33:02 +0000
1378+++ tests/scripts/unity-mir-lock-seat.conf 2014-04-03 20:07:08 +0000
1379@@ -15,7 +15,7 @@
1380 #?*UNITY-SYSTEM-COMPOSITOR READY
1381
1382 # Session starts
1383-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=mir USER=have-password1
1384+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=have-password1
1385 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1386
1387 # System compositor switches to session
1388
1389=== modified file 'tests/scripts/unity-mir-session-x-greeter.conf'
1390--- tests/scripts/unity-mir-session-x-greeter.conf 2014-03-17 18:33:02 +0000
1391+++ tests/scripts/unity-mir-session-x-greeter.conf 2014-04-03 20:07:08 +0000
1392@@ -38,7 +38,7 @@
1393 #?*GREETER-X-0 START-SESSION
1394
1395 # Session starts
1396-#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 DESKTOP_SESSION=mir USER=no-password1
1397+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/no-password1 XDG_SESSION_TYPE=mir XDG_SESSION_DESKTOP=mir USER=no-password1
1398 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1399
1400 # System compositor switches to session
1401
1402=== modified file 'tests/scripts/unity-plymouth.conf'
1403--- tests/scripts/unity-plymouth.conf 2014-03-17 18:33:02 +0000
1404+++ tests/scripts/unity-plymouth.conf 2014-04-03 20:07:08 +0000
1405@@ -33,7 +33,7 @@
1406 #?XSERVER-0 ACCEPT-CONNECT
1407
1408 # Session starts
1409-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1410+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1411 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1412 #?XSERVER-0 ACCEPT-CONNECT
1413 #?SESSION-X-0 CONNECT-XSERVER
1414
1415=== modified file 'tests/scripts/unity-switch.conf'
1416--- tests/scripts/unity-switch.conf 2014-03-17 18:33:02 +0000
1417+++ tests/scripts/unity-switch.conf 2014-04-03 20:07:08 +0000
1418@@ -23,7 +23,7 @@
1419 #?XSERVER-0 ACCEPT-CONNECT
1420
1421 # Session starts
1422-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1423+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1424 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1425 #?XSERVER-0 ACCEPT-CONNECT
1426 #?SESSION-X-0 CONNECT-XSERVER
1427@@ -66,7 +66,7 @@
1428 #?GREETER-X-1 TERMINATE SIGNAL=15
1429
1430 # New session starts
1431-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 DESKTOP_SESSION=default USER=have-password2
1432+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password2
1433 #?LOGIN1 ACTIVATE-SESSION SESSION=c2
1434 #?XSERVER-1 ACCEPT-CONNECT
1435 #?SESSION-X-1 CONNECT-XSERVER
1436
1437=== modified file 'tests/scripts/unity-xdg-seat.conf'
1438--- tests/scripts/unity-xdg-seat.conf 2014-03-17 18:33:02 +0000
1439+++ tests/scripts/unity-xdg-seat.conf 2014-04-03 20:07:08 +0000
1440@@ -24,7 +24,7 @@
1441 #?XSERVER-0 ACCEPT-CONNECT
1442
1443 # Session starts
1444-#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1445+#?SESSION-X-0 START XDG_SEAT=seat1 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1446 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1447 #?XSERVER-0 ACCEPT-CONNECT
1448 #?SESSION-X-0 CONNECT-XSERVER
1449
1450=== modified file 'tests/scripts/upstart-autologin.conf'
1451--- tests/scripts/upstart-autologin.conf 2014-03-17 18:33:02 +0000
1452+++ tests/scripts/upstart-autologin.conf 2014-04-03 20:07:08 +0000
1453@@ -24,7 +24,7 @@
1454 #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm
1455
1456 # Session starts
1457-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1458+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1459 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1460 #?XSERVER-0 ACCEPT-CONNECT
1461 #?SESSION-X-0 CONNECT-XSERVER
1462
1463=== modified file 'tests/scripts/upstart-login.conf'
1464--- tests/scripts/upstart-login.conf 2014-03-17 18:33:02 +0000
1465+++ tests/scripts/upstart-login.conf 2014-04-03 20:07:08 +0000
1466@@ -40,7 +40,7 @@
1467 #?INIT -q emit desktop-session-start DISPLAY_MANAGER=lightdm
1468
1469 # Session starts
1470-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1471+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1472 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1473 #?XSERVER-0 ACCEPT-CONNECT
1474 #?SESSION-X-0 CONNECT-XSERVER
1475
1476=== modified file 'tests/scripts/user-logged-in.conf'
1477--- tests/scripts/user-logged-in.conf 2014-03-17 18:33:02 +0000
1478+++ tests/scripts/user-logged-in.conf 2014-04-03 20:07:08 +0000
1479@@ -38,7 +38,7 @@
1480 #?GREETER-X-0 TERMINATE SIGNAL=15
1481
1482 # Session starts
1483-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
1484+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=prop-user
1485 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1486 #?XSERVER-0 ACCEPT-CONNECT
1487 #?SESSION-X-0 CONNECT-XSERVER
1488
1489=== modified file 'tests/scripts/user-renamed.conf'
1490--- tests/scripts/user-renamed.conf 2014-03-17 18:33:02 +0000
1491+++ tests/scripts/user-renamed.conf 2014-04-03 20:07:08 +0000
1492@@ -18,7 +18,7 @@
1493 #?XSERVER-0 ACCEPT-CONNECT
1494
1495 # Session starts
1496-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 DESKTOP_SESSION=default USER=change-user2
1497+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/change-user2 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=change-user2
1498 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1499 #?XSERVER-0 ACCEPT-CONNECT
1500 #?SESSION-X-0 CONNECT-XSERVER
1501
1502=== modified file 'tests/scripts/user-session.conf'
1503--- tests/scripts/user-session.conf 2014-03-17 18:33:02 +0000
1504+++ tests/scripts/user-session.conf 2014-04-03 20:07:08 +0000
1505@@ -38,7 +38,7 @@
1506 #?GREETER-X-0 TERMINATE SIGNAL=15
1507
1508 # Session starts, check it uses the default session
1509-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=default USER=prop-user
1510+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=prop-user
1511 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1512 #?XSERVER-0 ACCEPT-CONNECT
1513 #?SESSION-X-0 CONNECT-XSERVER
1514@@ -85,7 +85,7 @@
1515 #?GREETER-X-0 TERMINATE SIGNAL=15
1516
1517 # Session starts, check it uses the updated session
1518-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user DESKTOP_SESSION=alternative NAME=alternative USER=prop-user
1519+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/prop-user XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=alternative NAME=alternative USER=prop-user
1520 #?LOGIN1 ACTIVATE-SESSION SESSION=c3
1521 #?XSERVER-0 ACCEPT-CONNECT
1522 #?SESSION-X-0 CONNECT-XSERVER
1523
1524=== modified file 'tests/scripts/utmp-autologin.conf'
1525--- tests/scripts/utmp-autologin.conf 2014-03-17 18:33:02 +0000
1526+++ tests/scripts/utmp-autologin.conf 2014-04-03 20:07:08 +0000
1527@@ -25,7 +25,7 @@
1528 #?WTMP FILE=.*/wtmp TYPE=USER_PROCESS LINE=:0 ID=:0 USER=have-password1 HOST=:0
1529
1530 # Autologin session starts
1531-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1532+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1533 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1534 #?XSERVER-0 ACCEPT-CONNECT
1535 #?SESSION-X-0 CONNECT-XSERVER
1536
1537=== modified file 'tests/scripts/utmp-login.conf'
1538--- tests/scripts/utmp-login.conf 2014-03-17 18:33:02 +0000
1539+++ tests/scripts/utmp-login.conf 2014-04-03 20:07:08 +0000
1540@@ -40,7 +40,7 @@
1541 #?WTMP FILE=.*/wtmp TYPE=USER_PROCESS LINE=:0 ID=:0 USER=have-password1 HOST=:0
1542
1543 # Session starts
1544-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1545+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1546 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1547 #?XSERVER-0 ACCEPT-CONNECT
1548 #?SESSION-X-0 CONNECT-XSERVER
1549
1550=== modified file 'tests/scripts/vnc-login.conf'
1551--- tests/scripts/vnc-login.conf 2014-03-17 18:33:02 +0000
1552+++ tests/scripts/vnc-login.conf 2014-04-03 20:07:08 +0000
1553@@ -53,7 +53,7 @@
1554 #?GREETER-X-0 TERMINATE SIGNAL=15
1555
1556 # Session starts
1557-#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1558+#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1559 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1560 #?XSERVER-0 ACCEPT-CONNECT
1561 #?SESSION-X-0 CONNECT-XSERVER
1562
1563=== modified file 'tests/scripts/vnc-open-file-descriptors.conf'
1564--- tests/scripts/vnc-open-file-descriptors.conf 2014-03-17 18:33:02 +0000
1565+++ tests/scripts/vnc-open-file-descriptors.conf 2014-04-03 20:07:08 +0000
1566@@ -52,7 +52,7 @@
1567 #?GREETER-X-0 TERMINATE SIGNAL=15
1568
1569 # Session starts
1570-#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1571+#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1572 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1573 #?XSERVER-0 ACCEPT-CONNECT
1574 #?SESSION-X-0 CONNECT-XSERVER
1575
1576=== modified file 'tests/scripts/xauthority.conf'
1577--- tests/scripts/xauthority.conf 2014-03-17 18:33:02 +0000
1578+++ tests/scripts/xauthority.conf 2014-04-03 20:07:08 +0000
1579@@ -18,7 +18,7 @@
1580 #?XSERVER-0 ACCEPT-CONNECT
1581
1582 # Session starts
1583-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1584+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1585 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1586 #?XSERVER-0 ACCEPT-CONNECT
1587 #?SESSION-X-0 CONNECT-XSERVER
1588
1589=== modified file 'tests/scripts/xdg-current-desktop.conf'
1590--- tests/scripts/xdg-current-desktop.conf 2014-03-17 18:33:02 +0000
1591+++ tests/scripts/xdg-current-desktop.conf 2014-04-03 20:07:08 +0000
1592@@ -18,7 +18,7 @@
1593 #?XSERVER-0 ACCEPT-CONNECT
1594
1595 # Session starts
1596-#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=named USER=have-password1
1597+#?SESSION-X-0 START XDG_SEAT=seat0 XDG_VTNR=7 XDG_CURRENT_DESKTOP=TestDesktop XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=named USER=have-password1
1598 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1599 #?XSERVER-0 ACCEPT-CONNECT
1600 #?SESSION-X-0 CONNECT-XSERVER
1601
1602=== modified file 'tests/scripts/xdg-seat.conf'
1603--- tests/scripts/xdg-seat.conf 2014-03-17 18:33:02 +0000
1604+++ tests/scripts/xdg-seat.conf 2014-04-03 20:07:08 +0000
1605@@ -19,7 +19,7 @@
1606 #?XSERVER-0 ACCEPT-CONNECT
1607
1608 # Session starts
1609-#?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1610+#?SESSION-X-0 START XDG_SEAT=seat1 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1611 #?LOGIN1 ACTIVATE-SESSION SESSION=c0
1612 #?XSERVER-0 ACCEPT-CONNECT
1613 #?SESSION-X-0 CONNECT-XSERVER
1614
1615=== modified file 'tests/scripts/xdmcp-server-login.conf'
1616--- tests/scripts/xdmcp-server-login.conf 2014-03-17 18:33:02 +0000
1617+++ tests/scripts/xdmcp-server-login.conf 2014-04-03 20:07:08 +0000
1618@@ -50,7 +50,7 @@
1619 #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
1620
1621 # Session starts
1622-#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
1623+#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1624 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1625 #?XSERVER-98 ACCEPT-CONNECT
1626 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
1627
1628=== modified file 'tests/scripts/xdmcp-server-open-file-descriptors.conf'
1629--- tests/scripts/xdmcp-server-open-file-descriptors.conf 2014-03-17 18:33:02 +0000
1630+++ tests/scripts/xdmcp-server-open-file-descriptors.conf 2014-04-03 20:07:08 +0000
1631@@ -50,7 +50,7 @@
1632 #?GREETER-X-127.0.0.1:98 TERMINATE SIGNAL=15
1633
1634 # Session starts
1635-#?SESSION-X-127.0.0.1:98 START DESKTOP_SESSION=default USER=have-password1
1636+#?SESSION-X-127.0.0.1:98 START XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1637 #?LOGIN1 ACTIVATE-SESSION SESSION=c1
1638 #?XSERVER-98 ACCEPT-CONNECT
1639 #?SESSION-X-127.0.0.1:98 CONNECT-XSERVER
1640
1641=== modified file 'tests/scripts/xserver-no-share.conf'
1642--- tests/scripts/xserver-no-share.conf 2014-03-17 18:33:02 +0000
1643+++ tests/scripts/xserver-no-share.conf 2014-04-03 20:07:08 +0000
1644@@ -41,7 +41,7 @@
1645 #?XSERVER-1 ACCEPT-CONNECT
1646
1647 # Session starts
1648-#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
1649+#?SESSION-X-1 START XDG_SEAT=seat0 XDG_VTNR=8 XDG_GREETER_DATA_DIR=.*/have-password1 XDG_SESSION_TYPE=x11 XDG_SESSION_DESKTOP=default USER=have-password1
1650 #?XSERVER-1 ACCEPT-CONNECT
1651 #?SESSION-X-1 CONNECT-XSERVER
1652
1653
1654=== modified file 'tests/src/test-session.c'
1655--- tests/src/test-session.c 2014-02-26 03:49:42 +0000
1656+++ tests/src/test-session.c 2014-04-03 20:07:08 +0000
1657@@ -229,7 +229,7 @@
1658 int
1659 main (int argc, char **argv)
1660 {
1661- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *desktop_session, *mir_socket, *mir_vt, *mir_id;
1662+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *xdg_session_desktop, *mir_socket, *mir_vt, *mir_id;
1663 GString *status_text;
1664 int fd, open_max;
1665
1666@@ -240,7 +240,8 @@
1667 xdg_greeter_data_dir = getenv ("XDG_GREETER_DATA_DIR");
1668 xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
1669 xdg_session_class = getenv ("XDG_SESSION_CLASS");
1670- desktop_session = getenv ("DESKTOP_SESSION");
1671+ xdg_session_type = getenv ("XDG_SESSION_TYPE");
1672+ xdg_session_desktop = getenv ("XDG_SESSION_DESKTOP");
1673 mir_socket = getenv ("MIR_SOCKET");
1674 mir_vt = getenv ("MIR_SERVER_VT");
1675 mir_id = getenv ("MIR_SERVER_NAME");
1676@@ -293,8 +294,10 @@
1677 g_string_append_printf (status_text, " XDG_SESSION_COOKIE=%s", xdg_session_cookie);
1678 if (xdg_session_class)
1679 g_string_append_printf (status_text, " XDG_SESSION_CLASS=%s", xdg_session_class);
1680- if (desktop_session)
1681- g_string_append_printf (status_text, " DESKTOP_SESSION=%s", desktop_session);
1682+ if (xdg_session_type)
1683+ g_string_append_printf (status_text, " XDG_SESSION_TYPE=%s", xdg_session_type);
1684+ if (xdg_session_desktop)
1685+ g_string_append_printf (status_text, " XDG_SESSION_DESKTOP=%s", xdg_session_desktop);
1686 if (mir_vt > 0)
1687 g_string_append_printf (status_text, " MIR_SERVER_VT=%s", mir_vt);
1688 if (argc > 1)

Subscribers

People subscribed via source and target branches