Merge lp:~robert-ancell/lightdm/unity-session-vtnr into lp:lightdm

[Robert Ancell]

Set XDG_VTNR for unity sessions

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1742
http://jenkins.qa.ubuntu.com/job/lightdm-ci/149/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-saucy-amd64-ci/65

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/seat-unity.c'
--- src/seat-unity.c	2013-07-26 02:54:55 +0000
+++ src/seat-unity.c	2013-07-30 13:30:42 +0000
@@ -510,6 +510,12 @@
 
     greeter_session = greeter_new ();
     session_set_env (SESSION (greeter_session), "XDG_SEAT", "seat0");
+    if (!SEAT_UNITY (seat)->priv->use_vt_switching)
+    {
+        gchar *value = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->vt);
+        session_set_env (SESSION (greeter_session), "XDG_VTNR", value);
+        g_free (value);
+    }
 
     return greeter_session;
 }
@@ -521,6 +527,12 @@
 
     session = session_new ();
     session_set_env (session, "XDG_SEAT", "seat0");
+    if (!SEAT_UNITY (seat)->priv->use_vt_switching)
+    {
+        gchar *value = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->vt);
+        session_set_env (SESSION (session), "XDG_VTNR", value);
+        g_free (value);
+    }
 
     return session;
 }
 
=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2013-07-26 05:17:21 +0000
+++ tests/Makefile.am	2013-07-30 13:30:42 +0000
@@ -147,7 +147,8 @@
 	test-unity-mir-autologin \
 	test-unity-mir-greeter-x-session \
 	test-unity-mir-greeter-mir-session \
-	test-unity-mir-session-x-greeter
+	test-unity-mir-session-x-greeter \
+	test-unity-login1
 
 #	test-session-exit-error
 #	test-greeter-no-exit
@@ -400,6 +401,7 @@
 	scripts/unity-compositor-fail-ready.conf \
 	scripts/unity-compositor-fail-start.conf \
 	scripts/unity-login.conf \
+	scripts/unity-login1.conf \
 	scripts/unity-mir-autologin.conf \
 	scripts/unity-mir-greeter-mir-session.conf \
 	scripts/unity-mir-greeter-x-session.conf \
 
=== added file 'tests/scripts/unity-login1.conf'
--- tests/scripts/unity-login1.conf	1970-01-01 00:00:00 +0000
+++ tests/scripts/unity-login1.conf	2013-07-30 13:30:42 +0000
@@ -0,0 +1,43 @@
+#
+# Check logind variables are set in Unity sessions
+#
+
+[SeatDefaults]
+type=unity
+autologin-user=have-password1
+user-session=default
+
+#?RUNNER DAEMON-START
+
+# System compositor starts
+#?UNITY-SYSTEM-COMPOSITOR START VT=7
+#?*UNITY-SYSTEM-COMPOSITOR READY
+
+# X server starts
+#?XSERVER-0 START MIR-ID=0
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
+
+# Session starts
+#?SESSION-X-0 START USER=have-password1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
+
+# System compositor switches to session
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+
+# Check environment variables
+#?*SESSION-X-0 READ-ENV NAME=XDG_SEAT
+#?SESSION-X-0 READ-ENV NAME=XDG_SEAT VALUE=seat0
+#?*SESSION-X-0 READ-ENV NAME=XDG_VTNR
+#?SESSION-X-0 READ-ENV NAME=XDG_VTNR VALUE=7
+
+# Cleanup
+#?*STOP-DAEMON
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
+#?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
+#?RUNNER DAEMON-EXIT STATUS=0