Merge from trunk

[sojka/lightdm.git] / tests / scripts / unity-switch.conf

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index e78994d974eb75dfed0919491c8dc649f46f29ef..170404e02a2091daba1064dbf3b18e3429bf49c8 100644 (file)
--- a/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@ -14,7 +14,7 @@ user-session=default
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START MIR-ID=0
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -27,14 +27,14 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Show the greeter
 #?*SWITCH-TO-GREETER
 #?RUNNER SWITCH-TO-GREETER
 
 # New X server starts
-#?XSERVER-1 START MIR-ID=1
+#?XSERVER-1 START MIR-ID=x-1
 
 # Daemon connects when X server is ready
 #?*XSERVER-1 INDICATE-READY
@@ -52,7 +52,7 @@ user-session=default
 #?GREETER-X-1 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-1
 
 # Login
 #?*GREETER-X-1 AUTHENTICATE USERNAME=have-password2
@@ -72,7 +72,7 @@ user-session=default
 #?XSERVER-1 TERMINATE SIGNAL=15
 
 # X server starts
-#?XSERVER-2 START MIR-ID=2
+#?XSERVER-2 START MIR-ID=x-2
 #?*XSERVER-2 INDICATE-READY
 #?XSERVER-2 INDICATE-READY
 #?XSERVER-2 ACCEPT-CONNECT
@@ -85,7 +85,7 @@ user-session=default
 #?GREETER-X-2 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=2
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-2
 
 # Cleanup
 #?*STOP-DAEMON