Merge with trunk

diff --cc src/Makefile.am
Simple merge

diff --cc src/display-manager.c
Simple merge

diff --cc src/display-server.c
Simple merge

diff --cc src/greeter.c
index 16b9ea446a9f261c032de6992f33b99da9f7ea45,a97edb0239dd192f30e90ec536230f990f3758a1..6a796b70280d698a65441ef7d98ef01c3ceb1251
--- 1/src/greeter.c
--- 2/src/greeter.c
+++ b/src/greeter.c
@@@ -936,18 -919,18 +935,18 @@@ greeter_class_init (GreeterClass *klass
                        G_SIGNAL_RUN_LAST,
                        G_STRUCT_OFFSET (GreeterClass, connected),
                        NULL, NULL,
-                       g_cclosure_marshal_VOID__VOID,
+                       NULL,
                        G_TYPE_NONE, 0);
  
 -    signals[START_AUTHENTICATION] =
 -        g_signal_new ("start-authentication",
 +    signals[CREATE_SESSION] =
 +        g_signal_new ("create-session",
                        G_TYPE_FROM_CLASS (klass),
                        G_SIGNAL_RUN_LAST,
 -                      G_STRUCT_OFFSET (GreeterClass, start_authentication),
 +                      G_STRUCT_OFFSET (GreeterClass, create_session),
                        g_signal_accumulator_first_wins,
                        NULL,
-                       ldm_marshal_OBJECT__VOID,
+                       NULL,
 -                      SESSION_TYPE, 1, G_TYPE_STRING);
 +                      SESSION_TYPE, 0);
  
      signals[START_SESSION] =
          g_signal_new ("start-session",

diff --cc src/seat-unity.c
Simple merge

diff --cc src/seat.c
index 293d949c902a121129d4f7fa2e320a601895a8e4,bb8f9614904cfb0e9a072e0d31830691036de423..9db02224277f47206a6e5dcac757f3994a2f08c0
--- 1/src/seat.c
--- 2/src/seat.c
+++ b/src/seat.c
@@@ -1408,30 -847,22 +1408,30 @@@ seat_class_init (SeatClass *klass
  
      g_type_class_add_private (klass, sizeof (SeatPrivate));
  
 -    signals[DISPLAY_ADDED] =
 -        g_signal_new ("display-added",
 +    signals[SESSION_ADDED] =
 +        g_signal_new ("session-added",
 +                      G_TYPE_FROM_CLASS (klass),
 +                      G_SIGNAL_RUN_LAST,
 +                      G_STRUCT_OFFSET (SeatClass, session_added),
 +                      NULL, NULL,
-                       g_cclosure_marshal_VOID__OBJECT,
++                      NULL,
 +                      G_TYPE_NONE, 1, SESSION_TYPE);
 +    signals[RUNNING_USER_SESSION] =
 +        g_signal_new ("running-user-session",
                        G_TYPE_FROM_CLASS (klass),
                        G_SIGNAL_RUN_LAST,
 -                      G_STRUCT_OFFSET (SeatClass, display_added),
 +                      G_STRUCT_OFFSET (SeatClass, running_user_session),
                        NULL, NULL,
-                       g_cclosure_marshal_VOID__OBJECT,
+                       NULL,
 -                      G_TYPE_NONE, 1, DISPLAY_TYPE);
 -    signals[DISPLAY_REMOVED] =
 -        g_signal_new ("display-removed",
 +                      G_TYPE_NONE, 1, SESSION_TYPE);
 +    signals[SESSION_REMOVED] =
 +        g_signal_new ("session-removed",
                        G_TYPE_FROM_CLASS (klass),
                        G_SIGNAL_RUN_LAST,
 -                      G_STRUCT_OFFSET (SeatClass, display_removed),
 +                      G_STRUCT_OFFSET (SeatClass, session_removed),
                        NULL, NULL,
-                       g_cclosure_marshal_VOID__OBJECT,
+                       NULL,
 -                      G_TYPE_NONE, 1, DISPLAY_TYPE);
 +                      G_TYPE_NONE, 1, SESSION_TYPE);
      signals[STOPPED] =
          g_signal_new ("stopped",
                        G_TYPE_FROM_CLASS (klass),

diff --cc src/session.c
Simple merge

diff --cc tests/scripts/autologin-guest-fail-setup-script.conf
Simple merge

diff --cc tests/scripts/autologin-invalid-user.conf
index 48b1472a9cb8ae189242cc6fe682d1ad49394d02,c781ca4007c13b1d05bfab415155eb0f9015e125..6412a5e95cb7d1efdaa23668ec874dbea73b9114
--- 1/tests/scripts/autologin-invalid-user.conf
--- 2/tests/scripts/autologin-invalid-user.conf
+++ b/tests/scripts/autologin-invalid-user.conf
@@@ -7,15 -7,16 +7,16 @@@ autologin-user=invali
  
  #?RUNNER DAEMON-START
  
 +# (fails to start session for invalid user)
 +
  # X server starts
  #?XSERVER-0 START VT=7
- #?XSERVER-0 INDICATE-READY
  
- # LightDM connects to X server
+ # Daemon connects when X server is ready
+ #?*XSERVER-0 INDICATE-READY
+ #?XSERVER-0 INDICATE-READY
  #?XSERVER-0 ACCEPT-CONNECT
  
 -# (fails to start session for invalid user)
 -
  # Greeter starts
  #?GREETER-X-0 START
  #?XSERVER-0 ACCEPT-CONNECT

diff --cc tests/scripts/autologin-new-authtok.conf
Simple merge

diff --cc tests/scripts/autologin-password.conf
Simple merge

diff --cc tests/scripts/crash-authenticate.conf
Simple merge

diff --cc tests/scripts/denied.conf
Simple merge

diff --cc tests/scripts/expired.conf
Simple merge

diff --cc tests/scripts/login-guest-fail-setup-script.conf
Simple merge

diff --cc tests/scripts/login-invalid-session.conf
Simple merge

diff --cc tests/scripts/script-hook-fail-session-setup.conf
Simple merge

diff --cc tests/scripts/unity-switch.conf
index ac61d917796e549633b852a1f059e36fce9bd2cc,57549cf5f8548225ba660885cdda906a57fc4866..ef7f20d9d9289857d34c7f4255bdd8f7a8c3d615
--- 1/tests/scripts/unity-switch.conf
--- 2/tests/scripts/unity-switch.conf
+++ b/tests/scripts/unity-switch.conf
@@@ -67,16 -69,17 +69,17 @@@ user-session=defaul
  #?XSERVER-1 TERMINATE SIGNAL=15
  
  # X server starts
 -#?XSERVER-1 START MIR-ID=2
 -#?*XSERVER-1 INDICATE-READY
 -#?XSERVER-1 INDICATE-READY
 -#?XSERVER-1 ACCEPT-CONNECT
 +#?XSERVER-2 START MIR-ID=2
++#?*XSERVER-2 INDICATE-READY
 +#?XSERVER-2 INDICATE-READY
 +#?XSERVER-2 ACCEPT-CONNECT
  
  # Greeter starts
 -#?GREETER-X-1 START
 -#?XSERVER-1 ACCEPT-CONNECT
 -#?GREETER-X-1 CONNECT-XSERVER
 -#?GREETER-X-1 CONNECT-TO-DAEMON
 -#?GREETER-X-1 CONNECTED-TO-DAEMON
 +#?GREETER-X-2 START
 +#?XSERVER-2 ACCEPT-CONNECT
 +#?GREETER-X-2 CONNECT-XSERVER
 +#?GREETER-X-2 CONNECT-TO-DAEMON
 +#?GREETER-X-2 CONNECTED-TO-DAEMON
  
  # System compositor switches to greeter
  #?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=2

diff --cc tests/scripts/user-renamed-invalid.conf
Simple merge