Update environment variables that we pass to Mir.

Approved by Robert Ancell, PS Jenkins bot.

diff --git a/src/mir-server.c b/src/mir-server.c
index b784ae6e64774d0498e689c2dcd7ceeaa2bd2e79..9414e22fd60a2117c8fbea67e4e857847d2ab029 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -103,7 +103,7 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
     if (server->priv->id)
         session_set_env (session, "MIR_ID", server->priv->id);
     if (server->priv->parent_socket)
-        session_set_env (session, "MIR_SERVER_FILE", server->priv->parent_socket);
+        session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
     if (server->priv->vt > 0)
     {
         gchar *value = g_strdup_printf ("%d", server->priv->vt);
@@ -116,7 +116,7 @@ static void
 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
 {
     session_unset_env (session, "MIR_ID");
-    session_unset_env (session, "MIR_SERVER_FILE");
+    session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_VT");
 }
 

diff --git a/src/seat-unity.c b/src/seat-unity.c
index 6d36f929bae5117be76a194574ec9fa89dc97bdb..e37548d85d9b6a54829be17307404c33714ef0e7 100644 (file)
--- a/src/seat-unity.c
+++ b/src/seat-unity.c
@@ -370,7 +370,7 @@ seat_unity_start (Seat *seat)
     SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
     timeout = seat_get_integer_property (seat, "unity-compositor-timeout");
     compositor_command = seat_get_string_property (seat, "unity-compositor-command");
-    command = g_strdup_printf ("%s --from-dm-fd %d --to-dm-fd %d --vt %d", compositor_command, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1], SEAT_UNITY (seat)->priv->vt);
+    command = g_strdup_printf ("%s --standalone --file '%s' --from-dm-fd %d --to-dm-fd %d --vt %d", compositor_command, SEAT_UNITY (seat)->priv->mir_socket_filename, SEAT_UNITY (seat)->priv->to_compositor_pipe[0], SEAT_UNITY (seat)->priv->from_compositor_pipe[1], SEAT_UNITY (seat)->priv->vt);
 
     absolute_command = get_absolute_command (command);
     g_free (command);
@@ -509,7 +509,6 @@ create_mir_server (Seat *seat)
         id = g_strdup_printf ("%d", SEAT_UNITY (seat)->priv->next_id);
         SEAT_UNITY (seat)->priv->next_id++;
         mir_server_set_id (mir_server, id);
-        mir_server_set_parent_socket (mir_server, SEAT_UNITY (seat)->priv->mir_socket_filename);
         g_free (id);
     }   
 

diff --git a/tests/src/test-gobject-greeter.c b/tests/src/test-gobject-greeter.c
index cd8af447a71db164a3b744a49d09dd3f91fdd270..d970abb61f04fcfbf00bf3c1499632bfc16d920f 100644 (file)
--- a/tests/src/test-gobject-greeter.c
+++ b/tests/src/test-gobject-greeter.c
@@ -310,7 +310,7 @@ main (int argc, char **argv)
     xdg_seat = getenv ("XDG_SEAT");
     xdg_vtnr = getenv ("XDG_VTNR");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
-    mir_socket = getenv ("MIR_SERVER_FILE");
+    mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
     mir_id = getenv ("MIR_ID");
     if (display)

diff --git a/tests/src/test-session.c b/tests/src/test-session.c
index e9733a83a8b2c0539eed201a04d2a4d8c2a2fdc4..5e731d7c24e214cab4de599bbb477f9ec802cd1c 100644 (file)
--- a/tests/src/test-session.c
+++ b/tests/src/test-session.c
@@ -211,7 +211,7 @@ main (int argc, char **argv)
     xdg_vtnr = getenv ("XDG_VTNR");
     xdg_current_desktop = getenv ("XDG_CURRENT_DESKTOP");
     xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
-    mir_socket = getenv ("MIR_SERVER_FILE");
+    mir_socket = getenv ("MIR_SOCKET");
     mir_vt = getenv ("MIR_SERVER_VT");
     mir_id = getenv ("MIR_ID");
     if (display)