Fix unity tests

diff --git a/src/seat-unity.c b/src/seat-unity.c
index d8b3e8e2ebf713c633ff52fd793be2f4428a5637..182291b3e232414f6ee6214b3a200a937ead6100 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -73,6 +73,7 @@ struct SeatUnityPrivate
 
     /* The currently visible session */
     Session *active_session;
+    DisplayServer *active_display_server;
 };
 
 G_DEFINE_TYPE (SeatUnity, seat_unity, SEAT_TYPE);
@@ -489,8 +490,7 @@ seat_unity_create_session (Seat *seat)
 static void
 seat_unity_set_active_session (Seat *seat, Session *session)
 {
-    XServerLocal *xserver;
-    const gchar *id;
+    DisplayServer *display_server;
 
     /* If no compositor, have to use VT switching */
     if (SEAT_UNITY (seat)->priv->use_vt_switching)
@@ -507,11 +507,17 @@ seat_unity_set_active_session (Seat *seat, Session *session)
         return;
     SEAT_UNITY (seat)->priv->active_session = session;
 
-    xserver = XSERVER_LOCAL (session_get_display_server (session));
-    id = xserver_local_get_mir_id (xserver);
+    display_server = session_get_display_server (session);
+    if (SEAT_UNITY (seat)->priv->active_display_server != display_server)
+    {
+        const gchar *id;
+
+        SEAT_UNITY (seat)->priv->active_display_server = display_server;
+        id = xserver_local_get_mir_id (XSERVER_LOCAL (display_server));
 
-    g_debug ("Switching to Mir session %s", id);
-    write_message (SEAT_UNITY (seat), USC_MESSAGE_SET_ACTIVE_SESSION, id, strlen (id));
+        g_debug ("Switching to Mir session %s", id);
+        write_message (SEAT_UNITY (seat), USC_MESSAGE_SET_ACTIVE_SESSION, id, strlen (id));
+    }
 
     SEAT_CLASS (seat_unity_parent_class)->set_active_session (seat, session);
 }

diff --git a/src/seat.c b/src/seat.c
index 86fda045ff6a6b328a0881f06ca900cbb9da96b9..0b2dfd9f9392b3794c4194dc3b8440097eae492a 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -370,7 +370,12 @@ run_session (Seat *seat, Session *session)
         session_start (SESSION (greeter_session));
     }
     else
+    {
         session_run (session);
+
+        // FIXME: Wait until the session is ready
+        seat_set_active_session (seat, session);
+    }
 }
 
 static void