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);
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");
}
}
SEAT_UNITY (seat)->priv->mir_socket_filename = g_strdup ("/tmp/mir_socket"); // FIXME: Use this socket by default as XMir is hardcoded to this
+ process_set_env (SEAT_UNITY (seat)->priv->compositor_process, "MIR_SERVER_FILE", SEAT_UNITY (seat)->priv->mir_socket_filename);
+
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);
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);
}
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)
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)