Merge from trunk

[sojka/lightdm.git] / tests / scripts / unity-compositor-next-session.conf

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index bf22505e4a3eca1588ae5948de0a77f773ac0fdf..5fcf9fbf384bc77f55a07a3fd00b75523f89e655 100644 (file)
--- a/tests/scripts/unity-compositor-next-session.conf
+++ b/tests/scripts/unity-compositor-next-session.conf
@@ -15,7 +15,7 @@ autologin-in-background=true
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Greeter session
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 #?*XSERVER-0 INDICATE-READY
 #?XSERVER-0 INDICATE-READY
 #?XSERVER-0 ACCEPT-CONNECT
@@ -26,7 +26,7 @@ autologin-in-background=true
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Background session
-#?XSERVER-1 START MIR-ID=1
+#?XSERVER-1 START MIR-ID=x-1
 #?*XSERVER-1 INDICATE-READY
 #?XSERVER-1 INDICATE-READY
 #?XSERVER-1 ACCEPT-CONNECT
@@ -35,7 +35,7 @@ autologin-in-background=true
 #?SESSION-X-1 CONNECT-XSERVER
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Switch to user without a session
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
@@ -44,7 +44,7 @@ autologin-in-background=true
 # Switch to user with a session
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password2
 #?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
-#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-NEXT-SESSION ID=x-1
 
 # Cleanup
 #?*STOP-DAEMON