← Back to branch summary

~josharenson/lightdm/fix-null-logname

« back to all changes in this revision

Viewing changes to src/mir-server.c

  • Committer: Robert Ancell
  • Date: 2016-06-08 08:52:06 UTC
  • mfrom: (2315.1.1 new-mir-socket-variable)
  • Revision ID: robert.ancell@canonical.com-20160608085206-in128gmd4q2zdzgr
Use MIR_SERVER_HOST_SOCKET instead of MIR_SOCKET to tell Mir sessions the socket
to connect to Unity System Compositor on.

MIR_SOCKET used to work but a change in Mir 0.21 has broken this.
MIR_SERVER_HOST_SOCKET is the correct / recommended variable name so we now use
that.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mir-server.c
71
71
 
72
72
    server = MIR_SERVER (display_server);
73
73
    if (server->priv->parent_socket)
74
 
        session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
 
74
        session_set_env (session, "MIR_SERVER_HOST_SOCKET", server->priv->parent_socket);
75
75
    if (server->priv->vt > 0)
76
76
    {
77
77
        gchar *value = g_strdup_printf ("%d", server->priv->vt);
84
84
mir_server_disconnect_session (DisplayServer *display_server, Session *session)
85
85
{
86
86
    session_unset_env (session, "XDG_SESSION_TYPE");
87
 
    session_unset_env (session, "MIR_SOCKET");
 
87
    session_unset_env (session, "MIR_SERVER_HOST_SOCKET");
88
88
    session_unset_env (session, "MIR_SERVER_VT");
89
89
}
90
90