Merge lp:~robert-ancell/lightdm/new-mir-socket-variable into lp:lightdm

Proposed by Michael Terry on 2016-06-07
Status: Merged
Merged at revision: 2321
Proposed branch: lp:~robert-ancell/lightdm/new-mir-socket-variable
Merge into: lp:lightdm
Diff against target: 105 lines (+10/-10)
4 files modified
src/mir-server.c (+2/-2)
src/unity-system-compositor.c (+2/-2)
tests/src/test-gobject-greeter.c (+3/-3)
tests/src/test-session.c (+3/-3)
To merge this branch: bzr merge lp:~robert-ancell/lightdm/new-mir-socket-variable
Reviewer Review Type Date Requested Status
LightDM Development Team 2016-06-07 Pending
Review via email: mp+296698@code.launchpad.net

Commit message

WIP

Description of the change

WIP (just done so I can add this to a PPA)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/mir-server.c'
2--- src/mir-server.c 2015-10-16 10:04:18 +0000
3+++ src/mir-server.c 2016-06-07 16:19:18 +0000
4@@ -71,7 +71,7 @@
5
6 server = MIR_SERVER (display_server);
7 if (server->priv->parent_socket)
8- session_set_env (session, "MIR_SOCKET", server->priv->parent_socket);
9+ session_set_env (session, "MIR_SERVER_HOST_SOCKET", server->priv->parent_socket);
10 if (server->priv->vt > 0)
11 {
12 gchar *value = g_strdup_printf ("%d", server->priv->vt);
13@@ -84,7 +84,7 @@
14 mir_server_disconnect_session (DisplayServer *display_server, Session *session)
15 {
16 session_unset_env (session, "XDG_SESSION_TYPE");
17- session_unset_env (session, "MIR_SOCKET");
18+ session_unset_env (session, "MIR_SERVER_HOST_SOCKET");
19 session_unset_env (session, "MIR_SERVER_VT");
20 }
21
22
23=== modified file 'src/unity-system-compositor.c'
24--- src/unity-system-compositor.c 2016-05-19 02:01:57 +0000
25+++ src/unity-system-compositor.c 2016-06-07 16:19:18 +0000
26@@ -177,7 +177,7 @@
27 session_set_env (session, "XDG_SESSION_TYPE", "mir");
28
29 if (compositor->priv->socket)
30- session_set_env (session, "MIR_SOCKET", compositor->priv->socket);
31+ session_set_env (session, "MIR_SERVER_HOST_SOCKET", compositor->priv->socket);
32 if (IS_GREETER_SESSION (session))
33 name = "greeter-0";
34 else
35@@ -196,7 +196,7 @@
36 unity_system_compositor_disconnect_session (DisplayServer *display_server, Session *session)
37 {
38 session_unset_env (session, "XDG_SESSION_TYPE");
39- session_unset_env (session, "MIR_SOCKET");
40+ session_unset_env (session, "MIR_SERVER_HOST_SOCKET");
41 session_unset_env (session, "MIR_SERVER_NAME");
42 session_unset_env (session, "XDG_VTNR");
43 }
44
45=== modified file 'tests/src/test-gobject-greeter.c'
46--- tests/src/test-gobject-greeter.c 2015-07-28 08:38:40 +0000
47+++ tests/src/test-gobject-greeter.c 2016-06-07 16:19:18 +0000
48@@ -407,7 +407,7 @@
49 int
50 main (int argc, char **argv)
51 {
52- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *mir_socket, *mir_vt, *mir_id, *path;
53+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *mir_server_host_socket, *mir_vt, *mir_id, *path;
54 GString *status_text;
55
56 #if !defined(GLIB_VERSION_2_36)
57@@ -420,7 +420,7 @@
58 xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
59 xdg_session_class = getenv ("XDG_SESSION_CLASS");
60 xdg_session_type = getenv ("XDG_SESSION_TYPE");
61- mir_socket = getenv ("MIR_SOCKET");
62+ mir_server_host_socket = getenv ("MIR_SERVER_HOST_SOCKET");
63 mir_vt = getenv ("MIR_SERVER_VT");
64 mir_id = getenv ("MIR_SERVER_NAME");
65 if (display)
66@@ -432,7 +432,7 @@
67 }
68 else if (mir_id)
69 greeter_id = g_strdup_printf ("GREETER-MIR-%s", mir_id);
70- else if (mir_socket || mir_vt)
71+ else if (mir_server_host_socket || mir_vt)
72 greeter_id = g_strdup ("GREETER-MIR");
73 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)
74 greeter_id = g_strdup ("GREETER-WAYLAND");
75
76=== modified file 'tests/src/test-session.c'
77--- tests/src/test-session.c 2015-07-28 08:38:40 +0000
78+++ tests/src/test-session.c 2016-06-07 16:19:18 +0000
79@@ -229,7 +229,7 @@
80 int
81 main (int argc, char **argv)
82 {
83- gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *xdg_session_desktop, *mir_socket, *mir_vt, *mir_id;
84+ gchar *display, *xdg_seat, *xdg_vtnr, *xdg_current_desktop, *xdg_greeter_data_dir, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *xdg_session_desktop, *mir_server_host_socket, *mir_vt, *mir_id;
85 GString *status_text;
86 int fd, open_max;
87
88@@ -242,7 +242,7 @@
89 xdg_session_class = getenv ("XDG_SESSION_CLASS");
90 xdg_session_type = getenv ("XDG_SESSION_TYPE");
91 xdg_session_desktop = getenv ("XDG_SESSION_DESKTOP");
92- mir_socket = getenv ("MIR_SOCKET");
93+ mir_server_host_socket = getenv ("MIR_SERVER_HOST_SOCKET");
94 mir_vt = getenv ("MIR_SERVER_VT");
95 mir_id = getenv ("MIR_SERVER_NAME");
96 if (display)
97@@ -254,7 +254,7 @@
98 }
99 else if (mir_id)
100 session_id = g_strdup_printf ("SESSION-MIR-%s", mir_id);
101- else if (mir_socket || mir_vt)
102+ else if (mir_server_host_socket || mir_vt)
103 session_id = g_strdup ("SESSION-MIR");
104 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)
105 session_id = g_strdup ("SESSION-WAYLAND");

Subscribers

People subscribed via source and target branches