Override logind's or consolekit's decision to automatically change active session...

[sojka/lightdm.git] / tests / scripts / vnc-login.conf

diff --git a/tests/scripts/vnc-login.conf b/tests/scripts/vnc-login.conf
index 0c6199e98e8d106a2e4849477a21902c7d90acf1..def7cfe0770e29d0dd5f87b87aadd9f4984cb57e 100644 (file)
--- a/tests/scripts/vnc-login.conf
+++ b/tests/scripts/vnc-login.conf
@@ -3,15 +3,18 @@
 #
 
 [LightDM]
-minimum-display-number=50
 start-default-seat=false
 
 [VNCServer]
 enabled=true
 port=9999
 
+[SeatDefaults]
+user-session=default
+
+#?*START-DAEMON
 #?RUNNER DAEMON-START
-#?*WAIT 1
+#?*WAIT
 
 # Start a VNC client
 #?*START-VNC-CLIENT ARGS="::9999"
@@ -19,39 +22,44 @@ port=9999
 #?VNC-CLIENT CONNECT SERVER=::9999
 
 # Xvnc server starts
-#?XSERVER :50 START GEOMETRY=1024x768 DEPTH=8
+#?XSERVER-0 START GEOMETRY=1024x768 DEPTH=8 OPTION=FALSE
+
+# Daemon connects when X server is ready
+#?*XSERVER-0 INDICATE-READY
+#?XSERVER-0 INDICATE-READY
+#?XSERVER-0 ACCEPT-CONNECT
 
 # Negotiate with Xvnc
+#?*XSERVER-0 START-VNC
 #?VNC-CLIENT CONNECTED VERSION="RFB 003.007"
 
-#?XSERVER :50 INDICATE-READY
-
-# LightDM and vnc-client connect to X server
-#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
-#?(XSERVER :50 VNC-CLIENT-CONNECT VERSION="RFB 003.003"|XSERVER :50 ACCEPT-CONNECT)
+# VNC client connects to X server
+#?XSERVER-0 VNC-CLIENT-CONNECT VERSION="RFB 003.003"
 
 # Greeter starts and connects to remote X server
-#?GREETER :50 START
-#?XSERVER :50 ACCEPT-CONNECT
-#?GREETER :50 CONNECT-XSERVER
-#?GREETER :50 CONNECT-TO-DAEMON
-#?GREETER :50 CONNECTED-TO-DAEMON
+#?GREETER-X-0 START XDG_SESSION_CLASS=greeter
+#?LOGIN1 ACTIVATE-SESSION SESSION=c0
+#?XSERVER-0 ACCEPT-CONNECT
+#?GREETER-X-0 CONNECT-XSERVER
+#?GREETER-X-0 CONNECT-TO-DAEMON
+#?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # Log in
-#?*GREETER :50 AUTHENTICATE USERNAME=have-password1
-#?GREETER :50 SHOW-PROMPT TEXT="Password:"
-#?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
-#?*GREETER :50 START-SESSION
-#?GREETER :50 TERMINATE SIGNAL=15
+#?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1
+#?GREETER-X-0 SHOW-PROMPT TEXT="Password:"
+#?*GREETER-X-0 RESPOND TEXT="password"
+#?GREETER-X-0 AUTHENTICATION-COMPLETE USERNAME=have-password1 AUTHENTICATED=TRUE
+#?*GREETER-X-0 START-SESSION
+#?GREETER-X-0 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION :50 START USER=have-password1
-#?XSERVER :50 ACCEPT-CONNECT
-#?SESSION :50 CONNECT-XSERVER
+#?SESSION-X-0 START XDG_GREETER_DATA_DIR=.*/have-password1 DESKTOP_SESSION=default USER=have-password1
+#?LOGIN1 ACTIVATE-SESSION SESSION=c1
+#?XSERVER-0 ACCEPT-CONNECT
+#?SESSION-X-0 CONNECT-XSERVER
 
 # Clean up
 #?*STOP-DAEMON
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?SESSION-X-0 TERMINATE SIGNAL=15
+#?XSERVER-0 TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0