Merge Rob's session naming branch

diff --git a/src/mir-server.c b/src/mir-server.c
index 7d5572fa6375abd7728880d215456243403ce82f..7b8d4b41afde5dfd009b36a291b6f75260bc1989 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -22,9 +22,6 @@ struct MirServerPrivate
 
     /* Mir socket for this server to talk to parent */
     gchar *parent_socket;
-
-    /* ID to use for Mir connection */
-    gchar *id;
 };
 
 G_DEFINE_TYPE (MirServer, mir_server, DISPLAY_SERVER_TYPE);
@@ -53,21 +50,6 @@ mir_server_set_parent_socket (MirServer *server, const gchar *parent_socket)
     server->priv->parent_socket = g_strdup (parent_socket);
 }
 
-void
-mir_server_set_id (MirServer *server, const gchar *id)
-{
-    g_return_if_fail (server != NULL);
-    g_free (server->priv->id);
-    server->priv->id = g_strdup (id);
-}
-
-const gchar *
-mir_server_get_id (MirServer *server)
-{
-    g_return_val_if_fail (server != NULL, NULL);
-    return server->priv->id;
-}
-
 static const gchar *
 mir_server_get_session_type (DisplayServer *server)
 {
@@ -86,8 +68,6 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
     MirServer *server;
 
     server = MIR_SERVER (display_server);
-    if (server->priv->id)
-        session_set_env (session, "MIR_SERVER_NAME", server->priv->id);
     if (server->priv->parent_socket)
         session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
     if (server->priv->vt > 0)
@@ -101,7 +81,6 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
 static void
 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
 {
-    session_unset_env (session, "MIR_SERVER_NAME");
     session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_VT");
 }
@@ -111,7 +90,6 @@ mir_server_init (MirServer *server)
 {
     server->priv = G_TYPE_INSTANCE_GET_PRIVATE (server, MIR_SERVER_TYPE, MirServerPrivate);
     server->priv->vt = -1;
-    display_server_set_name (DISPLAY_SERVER (server), "mir");
 }
 
 static void
@@ -123,7 +101,6 @@ mir_server_finalize (GObject *object)
 
     if (server->priv->vt > 0)
         vt_unref (server->priv->vt);
-    g_free (server->priv->id);
     g_free (server->priv->parent_socket);
 
     G_OBJECT_CLASS (mir_server_parent_class)->finalize (object);

diff --git a/src/mir-server.h b/src/mir-server.h
index d91ec560f01761ff643e81611896dac478ebdca4..3e7bc0bba935d7950a5e8710ecde6abbd5494fbc 100644 (file)
--- a/src/mir-server.h
+++ b/src/mir-server.h
@@ -44,10 +44,6 @@ void mir_server_set_vt (MirServer *server, gint vt);
 
 void mir_server_set_parent_socket (MirServer *server, const gchar *parent_socket);
 
-void mir_server_set_id (MirServer *server, const gchar *id);
-
-const gchar *mir_server_get_id (MirServer *server);
-
 G_END_DECLS
 
 #endif /* MIR_SERVER_H_ */

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 5eb1fcf7f537e7f5b1cb67b2dcd3205b0ed6edc5..33d5ffda802a41f41b961017ee61da0af6d75b24 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -64,8 +64,10 @@ struct SeatUnityPrivate
     /* Timeout when waiting for compositor to start */
     guint compositor_timeout;
 
-    /* Next Mir ID to use for a compositor client */
-    gint next_id;
+    /* Next Mir ID to use for a Mir sessions, X server and greeters */
+    gint next_session_id;
+    gint next_x_server_id;
+    gint next_greeter_id;
 
     /* TRUE if using VT switching fallback */
     gboolean use_vt_switching;
@@ -423,8 +425,8 @@ create_x_server (Seat *seat)
     {
         gchar *id;
 
-        id = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->next_id);
-        SEAT_UNITY (seat)->priv->next_id++;
+        id = g_strdup_printf ("x-%d", SEAT_UNITY (seat)->priv->next_x_server_id);
+        SEAT_UNITY (seat)->priv->next_x_server_id++;
         x_server_local_set_mir_id (x_server, id);
         x_server_local_set_mir_socket (x_server, SEAT_UNITY (seat)->priv->mir_socket_filename);
         g_free (id);
@@ -493,7 +495,7 @@ create_x_server (Seat *seat)
 }
 
 static DisplayServer *
-create_mir_server (Seat *seat, gboolean is_greeter)
+create_mir_server (Seat *seat)
 {
     MirServer *mir_server;
 
@@ -502,33 +504,17 @@ create_mir_server (Seat *seat, gboolean is_greeter)
 
     if (SEAT_UNITY (seat)->priv->use_vt_switching)
         mir_server_set_vt (mir_server, vt_get_unused ());
-    else
-    {
-        gchar *id;
-
-        // If we're a greeter, mark our ID that way, so USC can treat it specially
-        id = g_strdup_printf ("%s%d", is_greeter ? "greeter-" : "", SEAT_UNITY (seat)->priv->next_id);
-        mir_server_set_id (mir_server, id);
-        g_free (id);
-
-        // Now set display name for logging and internal use
-        id = g_strdup_printf ("mir-%d", SEAT_UNITY (seat)->priv->next_id);
-        display_server_set_name (DISPLAY_SERVER (mir_server), id);
-        g_free (id);
-
-        SEAT_UNITY (seat)->priv->next_id++;
-    }   
 
     return DISPLAY_SERVER (mir_server);
 }
 
 static DisplayServer *
-seat_unity_create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+seat_unity_create_display_server (Seat *seat, const gchar *session_type)
 {  
     if (strcmp (session_type, "x") == 0)
         return create_x_server (seat);
     else if (strcmp (session_type, "mir") == 0)
-        return create_mir_server (seat, is_greeter);
+        return create_mir_server (seat);
     else
     {
         l_warning (seat, "Can't create unsupported display server '%s'", session_type);
@@ -541,6 +527,7 @@ seat_unity_create_greeter_session (Seat *seat)
 {
     Greeter *greeter_session;
     const gchar *xdg_seat;
+    gchar *id;
     gint vt = -1;
 
     greeter_session = SEAT_CLASS (seat_unity_parent_class)->create_greeter_session (seat);
@@ -550,6 +537,11 @@ seat_unity_create_greeter_session (Seat *seat)
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (SESSION (greeter_session), "XDG_SEAT", xdg_seat);
 
+    id = g_strdup_printf ("greeter-%d", SEAT_UNITY (seat)->priv->next_greeter_id);
+    SEAT_UNITY (seat)->priv->next_greeter_id++;
+    session_set_env (SESSION (greeter_session), "MIR_SERVER_NAME", id);
+    g_free (id);
+
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
         vt = SEAT_UNITY (seat)->priv->vt;
 
@@ -571,6 +563,7 @@ seat_unity_create_session (Seat *seat)
 {
     Session *session;
     const gchar *xdg_seat;
+    gchar *id;
     gint vt = -1;
 
     session = SEAT_CLASS (seat_unity_parent_class)->create_session (seat);
@@ -580,6 +573,11 @@ seat_unity_create_session (Seat *seat)
     l_debug (seat, "Setting XDG_SEAT=%s", xdg_seat);
     session_set_env (session, "XDG_SEAT", xdg_seat);
 
+    id = g_strdup_printf ("session-%d", SEAT_UNITY (seat)->priv->next_session_id);
+    SEAT_UNITY (seat)->priv->next_session_id++;
+    session_set_env (session, "MIR_SERVER_NAME", id);
+    g_free (id);
+
     if (!SEAT_UNITY (seat)->priv->use_vt_switching)
         vt = SEAT_UNITY (seat)->priv->vt;
 
@@ -625,8 +623,8 @@ seat_unity_set_active_session (Seat *seat, Session *session)
 
         if (IS_X_SERVER_LOCAL (display_server))
             id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
-        else if (IS_MIR_SERVER (display_server))
-            id = mir_server_get_id (MIR_SERVER (display_server));
+        else
+            id = session_get_env (session, "MIR_SERVER_NAME");
 
         if (id)
         {
@@ -681,8 +679,8 @@ seat_unity_set_next_session (Seat *seat, Session *session)
 
     if (IS_X_SERVER_LOCAL (display_server))
         id = x_server_local_get_mir_id (X_SERVER_LOCAL (display_server));
-    else if (IS_MIR_SERVER (display_server))
-        id = mir_server_get_id (MIR_SERVER (display_server));
+    else
+        id = session_get_env (session, "MIR_SESSION_NAME");
 
     if (id)
     {

diff --git a/src/seat-xdmcp-session.c b/src/seat-xdmcp-session.c
index 5aace88a4bef8b23aa0ca9c48591f1d0eb7da7c7..62a21f460159e330e0c0d50ee71c0f695fcbc045 100644 (file)
--- a/src/seat-xdmcp-session.c
+++ b/src/seat-xdmcp-session.c
@@ -34,7 +34,7 @@ seat_xdmcp_session_new (XDMCPSession *session)
 }
 
 static DisplayServer *
-seat_xdmcp_session_create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+seat_xdmcp_session_create_display_server (Seat *seat, const gchar *session_type)
 {
     XAuthority *authority;
     gchar *host;

diff --git a/src/seat-xlocal.c b/src/seat-xlocal.c
index f164c1e5fca352b1e3d3c23684770d99d9435925..647adc28ebc9c60352369b9eff24259e0ecbafaf 100644 (file)
--- a/src/seat-xlocal.c
+++ b/src/seat-xlocal.c
@@ -58,7 +58,7 @@ x_server_transition_plymouth_cb (XServerLocal *x_server, Seat *seat)
 }
 
 static DisplayServer *
-seat_xlocal_create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+seat_xlocal_create_display_server (Seat *seat, const gchar *session_type)
 {  
     if (strcmp (session_type, "x") != 0)
         return NULL;

diff --git a/src/seat-xremote.c b/src/seat-xremote.c
index 5637133333de40893d355617efa1cbc0233efe0f..32e8726aab3ef625bb1e97f79b24c26e6ace73b7 100644 (file)
--- a/src/seat-xremote.c
+++ b/src/seat-xremote.c
@@ -25,7 +25,7 @@ seat_xremote_setup (Seat *seat)
 }
 
 static DisplayServer *
-seat_xremote_create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+seat_xremote_create_display_server (Seat *seat, const gchar *session_type)
 {
     XServerRemote *x_server;
     const gchar *hostname;

diff --git a/src/seat-xvnc.c b/src/seat-xvnc.c
index ac755a0f10b6df3962ee8812045f994380eade72..ecabc9b21ff4b0153b9797af55e4c67a34b353af 100644 (file)
--- a/src/seat-xvnc.c
+++ b/src/seat-xvnc.c
@@ -34,7 +34,7 @@ SeatXVNC *seat_xvnc_new (GSocket *connection)
 }
 
 static DisplayServer *
-seat_xvnc_create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+seat_xvnc_create_display_server (Seat *seat, const gchar *session_type)
 {
     XServerXVNC *x_server;
     const gchar *command = NULL;

diff --git a/src/seat.c b/src/seat.c
index 35a87eb6fbff5ee6a45a3164f1bb66e696ecb7ef..cdd6efa14943a2370d0563d8f35f4564697bc701 100644 (file)
--- a/src/seat.c
+++ b/src/seat.c
@@ -83,7 +83,7 @@ typedef struct
 static GHashTable *seat_modules = NULL;
 
 // FIXME: Make a get_display_server() that re-uses display servers if supported
-static DisplayServer *create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter);
+static DisplayServer *create_display_server (Seat *seat, const gchar *session_type);
 static Greeter *create_greeter_session (Seat *seat);
 static void start_session (Seat *seat, Session *session);
 
@@ -419,7 +419,7 @@ switch_to_greeter_from_failed_session (Seat *seat, Session *session)
     {
         DisplayServer *display_server;
 
-        display_server = create_display_server (seat, session_get_session_type (session), TRUE);
+        display_server = create_display_server (seat, session_get_session_type (session));
         if (!display_server_start (display_server))
         {
             l_debug (seat, "Failed to start display server for greeter");
@@ -1029,7 +1029,7 @@ greeter_start_session_cb (Greeter *greeter, SessionType type, const gchar *sessi
     /* Otherwise start a new display server for this session */
     else
     {
-        display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+        display_server = create_display_server (seat, session_get_session_type (session));
         session_set_display_server (session, display_server);
         if (!display_server_start (display_server))
         {
@@ -1168,13 +1168,13 @@ display_server_ready_cb (DisplayServer *display_server, Seat *seat)
 }
 
 static DisplayServer *
-create_display_server (Seat *seat, const gchar *session_type, gboolean is_greeter)
+create_display_server (Seat *seat, const gchar *session_type)
 {
     DisplayServer *display_server;
 
     l_debug (seat, "Creating display server of type %s", session_type);
 
-    display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type, is_greeter);
+    display_server = SEAT_GET_CLASS (seat)->create_display_server (seat, session_type);
     if (!display_server)
         return NULL;
 
@@ -1225,7 +1225,7 @@ seat_switch_to_greeter (Seat *seat)
         g_object_unref (seat->priv->session_to_activate);
     seat->priv->session_to_activate = g_object_ref (greeter_session);
 
-    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
+    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
     session_set_display_server (SESSION (greeter_session), display_server);
     if (!display_server_start (display_server))
         return FALSE;
@@ -1258,7 +1258,7 @@ switch_authentication_complete_cb (Session *session, Seat *seat)
             if (seat->priv->session_to_activate)
                 g_object_unref (seat->priv->session_to_activate);
             seat->priv->session_to_activate = g_object_ref (session);
-            display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+            display_server = create_display_server (seat, session_get_session_type (session));
             session_set_display_server (session, display_server);
             display_server_start (display_server);
         }
@@ -1279,7 +1279,7 @@ switch_authentication_complete_cb (Session *session, Seat *seat)
         g_object_unref (seat->priv->session_to_activate);
     seat->priv->session_to_activate = g_object_ref (greeter_session);
 
-    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
+    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
     session_set_display_server (SESSION (greeter_session), display_server);
     display_server_start (display_server);
 }
@@ -1350,7 +1350,7 @@ seat_switch_to_guest (Seat *seat, const gchar *session_name)
     if (!session)
         return FALSE;
 
-    display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+    display_server = create_display_server (seat, session_get_session_type (session));
     if (!display_server_start (display_server))
         return FALSE;
 
@@ -1389,7 +1389,7 @@ seat_lock (Seat *seat, const gchar *username)
     if (!greeter_session)
         return FALSE;
 
-    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)), TRUE);
+    display_server = create_display_server (seat, session_get_session_type (SESSION (greeter_session)));
     if (!display_server_start (display_server))
         return FALSE;
 
@@ -1450,7 +1450,7 @@ seat_real_start (Seat *seat)
     if (!get_start_local_sessions (seat))
     {
         DisplayServer *display_server;
-        display_server = create_display_server (seat, "x", FALSE); // FIXME: Not necessarily an X seat, but not sure what to put here
+        display_server = create_display_server (seat, "x"); // FIXME: Not necessarily an X seat, but not sure what to put here
         return display_server_start (display_server);
     }
 
@@ -1488,7 +1488,7 @@ seat_real_start (Seat *seat)
                 g_object_unref (seat->priv->session_to_activate);
             seat->priv->session_to_activate = g_object_ref (session);
 
-            display_server = create_display_server (seat, session_get_session_type (session), FALSE);
+            display_server = create_display_server (seat, session_get_session_type (session));
             session_set_display_server (session, display_server);
             if (!display_server || !display_server_start (display_server))
             {
@@ -1532,7 +1532,7 @@ seat_real_start (Seat *seat)
                 greeter_set_hint (greeter_session, "autologin-guest", "true");
         }
 
-        display_server = create_display_server (seat, session_get_session_type (session), TRUE);
+        display_server = create_display_server (seat, session_get_session_type (session));
         session_set_display_server (session, display_server);
         if (!display_server || !display_server_start (display_server))
         {
@@ -1556,7 +1556,7 @@ seat_real_start (Seat *seat)
     {
         DisplayServer *background_display_server;
 
-        background_display_server = create_display_server (seat, session_get_session_type (background_session), FALSE);
+        background_display_server = create_display_server (seat, session_get_session_type (background_session));
         session_set_display_server (background_session, background_display_server);
         if (!display_server_start (background_display_server))
             l_warning (seat, "Failed to start display server for background session");

diff --git a/src/seat.h b/src/seat.h
index 50175cb981b39d3681c9c33049299f35d8bfe3a0..7457230d53532677dbb5d11f11f0f68670409f6b 100644 (file)
--- a/src/seat.h
+++ b/src/seat.h
@@ -41,7 +41,7 @@ typedef struct
     gboolean (*get_start_local_sessions) (Seat *seat);
     void (*setup)(Seat *seat);
     gboolean (*start)(Seat *seat);
-    DisplayServer *(*create_display_server) (Seat *seat, const gchar *session_type, gboolean is_greeter);
+    DisplayServer *(*create_display_server) (Seat *seat, const gchar *session_type);
     gboolean (*display_server_supports_session_type) (Seat *seat, DisplayServer *display_server, const gchar *session_type);
     Greeter *(*create_greeter_session) (Seat *seat);
     Session *(*create_session) (Seat *seat);

diff --git a/src/session.c b/src/session.c
index 888432d2873efe3e2c03284db27c74b335a28c0d..a3c3578d0a42ade501fa25d7f3dd7d18047bc4b3 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -302,6 +302,21 @@ session_set_env (Session *session, const gchar *name, const gchar *value)
         session->priv->env = g_list_append (session->priv->env, entry);
 }
 
+const gchar *
+session_get_env (Session *session, const gchar *name)
+{
+    GList *link;
+    gchar *entry;
+
+    link = find_env_entry (session, name);
+    if (!link)
+        return NULL;
+  
+    entry = link->data;
+
+    return entry + strlen (name) + 1;
+}
+
 void
 session_unset_env (Session *session, const gchar *name)
 {

diff --git a/src/session.h b/src/session.h
index 11182b5c4ec9b147b4d315106c1d8c6d70c861bd..ff468490b92db7a506304f0bb1de2be2a0b639d6 100644 (file)
--- a/src/session.h
+++ b/src/session.h
@@ -99,6 +99,8 @@ void session_set_remote_host_name (Session *session, const gchar *remote_host_na
 
 void session_set_env (Session *session, const gchar *name, const gchar *value);
 
+const gchar *session_get_env (Session *session, const gchar *name);
+
 void session_unset_env (Session *session, const gchar *name);
 
 void session_set_argv (Session *session, gchar **argv);

diff --git a/tests/scripts/unity-autologin.conf b/tests/scripts/unity-autologin.conf
index 421d9e58bb8d6e2b0f4f10255b4a2fad9fe3ff52..59a339bd8a551318c98e449c898afb5e15d17c24 100644 (file)
--- a/tests/scripts/unity-autologin.conf
+++ b/tests/scripts/unity-autologin.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,7 +27,7 @@ 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
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-compositor-command.conf b/tests/scripts/unity-compositor-command.conf
index 01a2b01e67338e77cf850b5cd90a006c2a253bd8..5f50b41236e94aae820e08168e4093139bc92c36 100644 (file)
--- a/tests/scripts/unity-compositor-command.conf
+++ b/tests/scripts/unity-compositor-command.conf
@@ -14,7 +14,7 @@ unity-compositor-command=unity-system-compositor --test
 #?*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
@@ -29,7 +29,7 @@ unity-compositor-command=unity-system-compositor --test
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-compositor-next-session.conf b/tests/scripts/unity-compositor-next-session.conf
index d1f3f9148d1b67d380f184c3e3cca3ff21d8f420..1a6581b6e70141ea921d0d4fbcc8d288fd728fac 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

diff --git a/tests/scripts/unity-login.conf b/tests/scripts/unity-login.conf
index 1e2b14d6331ffa643f93504455d237f3cb0af01e..fbed1345d0b6cee7d9fc8541226e6a63bca7ccd2 100644 (file)
--- a/tests/scripts/unity-login.conf
+++ b/tests/scripts/unity-login.conf
@@ -13,7 +13,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
@@ -28,7 +28,7 @@ user-session=default
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Log into account with a password
 #?*GREETER-X-0 AUTHENTICATE USERNAME=have-password1

diff --git a/tests/scripts/unity-mir-autologin.conf b/tests/scripts/unity-mir-autologin.conf
index 0d59bda5c7ef1e18529ecf986b793b6e91bfdd34..8dcacf458714a00a814d4864523cc83acc6808c0 100644 (file)
--- a/tests/scripts/unity-mir-autologin.conf
+++ b/tests/scripts/unity-mir-autologin.conf
@@ -14,13 +14,13 @@ user-session=mir
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # Session starts
-#?SESSION-MIR-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=have-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-0 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-mir-greeter-mir-session.conf b/tests/scripts/unity-mir-greeter-mir-session.conf
index 4153fa2b6b8373240d61a46dedbc9c6c5337dfb6..acbbe24e5b997c58981503038d105e122782fbfb 100644 (file)
--- a/tests/scripts/unity-mir-greeter-mir-session.conf
+++ b/tests/scripts/unity-mir-greeter-mir-session.conf
@@ -26,16 +26,16 @@ user-session=mir
 #?*GREETER-MIR-greeter-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Greeter stops
 #?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-1 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-mir-greeter-x-session.conf b/tests/scripts/unity-mir-greeter-x-session.conf
index fe37466ed387787f08e1b0f0433d27a5b8acd092..86e4ab8f36c17e8b3fbd85ba65f431f70cf51b81 100644 (file)
--- a/tests/scripts/unity-mir-greeter-x-session.conf
+++ b/tests/scripts/unity-mir-greeter-x-session.conf
@@ -26,7 +26,7 @@ user-session=default
 #?*GREETER-MIR-greeter-0 START-SESSION
 
 # X server starts
-#?XSERVER-0 START MIR-ID=1
+#?XSERVER-0 START MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -39,7 +39,7 @@ user-session=default
 #?SESSION-X-0 CONNECT-XSERVER
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Greeter stops
 #?GREETER-MIR-greeter-0 TERMINATE SIGNAL=15

diff --git a/tests/scripts/unity-mir-session-x-greeter.conf b/tests/scripts/unity-mir-session-x-greeter.conf
index 3fe743ae8765fe686e054c3384ab47a3ae3e44dc..9edf6807b3ed929c985f41ef5fc27568c913df21 100644 (file)
--- a/tests/scripts/unity-mir-session-x-greeter.conf
+++ b/tests/scripts/unity-mir-session-x-greeter.conf
@@ -13,7 +13,7 @@ user-session=mir
 #?*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
@@ -28,7 +28,7 @@ user-session=mir
 #?GREETER-X-0 CONNECTED-TO-DAEMON
 
 # System compositor switches to greeter
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=0
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=x-0
 
 # Log into account
 #?*GREETER-X-0 AUTHENTICATE USERNAME=no-password1
@@ -36,10 +36,10 @@ user-session=mir
 #?*GREETER-X-0 START-SESSION
 
 # Session starts
-#?SESSION-MIR-1 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
+#?SESSION-MIR-session-0 START XDG_SEAT=seat0 XDG_VTNR=7 DESKTOP_SESSION=mir USER=no-password1
 
 # System compositor switches to session
-#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=1
+#?UNITY-SYSTEM-COMPOSITOR SET-ACTIVE-SESSION ID=session-0
 
 # Greeter quits once session ready
 #?GREETER-X-0 TERMINATE SIGNAL=15
@@ -47,6 +47,6 @@ user-session=mir
 
 # Cleanup
 #?*STOP-DAEMON
-#?SESSION-MIR-1 TERMINATE SIGNAL=15
+#?SESSION-MIR-session-0 TERMINATE SIGNAL=15
 #?UNITY-SYSTEM-COMPOSITOR TERMINATE SIGNAL=15
 #?RUNNER DAEMON-EXIT STATUS=0

diff --git a/tests/scripts/unity-plymouth.conf b/tests/scripts/unity-plymouth.conf
index 6ceeefa11f051182014027f67316b06aaac60d54..4c27c3c8bad1f312678723afec0697aee08eed66 100644 (file)
--- a/tests/scripts/unity-plymouth.conf
+++ b/tests/scripts/unity-plymouth.conf
@@ -24,7 +24,7 @@ active=true
 #?*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
@@ -37,7 +37,7 @@ active=true
 #?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
 
 # Cleanup
 #?*STOP-DAEMON

diff --git a/tests/scripts/unity-switch.conf b/tests/scripts/unity-switch.conf
index 7bd8981d3f4641fa530ab20cd466e372208de146..4e8e770930973667ea89b483afed92451f120bd3 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

diff --git a/tests/scripts/unity-xdg-seat.conf b/tests/scripts/unity-xdg-seat.conf
index c76923dedf1040bb9ab5068bb56a178d83323060..85ee61cb6ea63cd65ba9c3c7528ce3452244a1df 100644 (file)
--- a/tests/scripts/unity-xdg-seat.conf
+++ b/tests/scripts/unity-xdg-seat.conf
@@ -15,7 +15,7 @@ xdg-seat=seat1
 #?*UNITY-SYSTEM-COMPOSITOR READY
 
 # X server starts
-#?XSERVER-0 START SEAT=seat1 MIR-ID=0
+#?XSERVER-0 START SEAT=seat1 MIR-ID=x-0
 
 # Daemon connects when X server is ready
 #?*XSERVER-0 INDICATE-READY
@@ -28,7 +28,7 @@ xdg-seat=seat1
 #?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
 
 # Cleanup
 #?*STOP-DAEMON