Merge from trunk

[sojka/lightdm.git] / src / mir-server.c

diff --git a/src/mir-server.c b/src/mir-server.c
index 9414e22fd60a2117c8fbea67e4e857847d2ab029..cf9c3553572e264b6307cbd4e720d2776706d20e 100644 (file)
--- a/src/mir-server.c
+++ b/src/mir-server.c
@@ -101,7 +101,7 @@ mir_server_connect_session (DisplayServer *display_server, Session *session)
 
     server = MIR_SERVER (display_server);
     if (server->priv->id)
-        session_set_env (session, "MIR_ID", 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)
@@ -115,7 +115,7 @@ 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_ID");
+    session_unset_env (session, "MIR_SERVER_NAME");
     session_unset_env (session, "MIR_SOCKET");
     session_unset_env (session, "MIR_SERVER_VT");
 }