Light Display Manager

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

  1. new-mir-socket-variable
  2. Merge into trunk
Proposed by Michael Terry
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 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
=== modified file 'src/mir-server.c'
--- src/mir-server.c 2015-10-16 10:04:18 +0000
+++ src/mir-server.c 2016-06-07 16:19:18 +0000
@@ -71,7 +71,7 @@
7171
72 server = MIR_SERVER (display_server);72 server = MIR_SERVER (display_server);
73 if (server->priv->parent_socket)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 if (server->priv->vt > 0)75 if (server->priv->vt > 0)
76 {76 {
77 gchar *value = g_strdup_printf ("%d", server->priv->vt);77 gchar *value = g_strdup_printf ("%d", server->priv->vt);
@@ -84,7 +84,7 @@
84mir_server_disconnect_session (DisplayServer *display_server, Session *session)84mir_server_disconnect_session (DisplayServer *display_server, Session *session)
85{85{
86 session_unset_env (session, "XDG_SESSION_TYPE");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 session_unset_env (session, "MIR_SERVER_VT");88 session_unset_env (session, "MIR_SERVER_VT");
89}89}
9090
9191
=== modified file 'src/unity-system-compositor.c'
--- src/unity-system-compositor.c 2016-05-19 02:01:57 +0000
+++ src/unity-system-compositor.c 2016-06-07 16:19:18 +0000
@@ -177,7 +177,7 @@
177 session_set_env (session, "XDG_SESSION_TYPE", "mir");177 session_set_env (session, "XDG_SESSION_TYPE", "mir");
178178
179 if (compositor->priv->socket)179 if (compositor->priv->socket)
180 session_set_env (session, "MIR_SOCKET", compositor->priv->socket);180 session_set_env (session, "MIR_SERVER_HOST_SOCKET", compositor->priv->socket);
181 if (IS_GREETER_SESSION (session))181 if (IS_GREETER_SESSION (session))
182 name = "greeter-0";182 name = "greeter-0";
183 else183 else
@@ -196,7 +196,7 @@
196unity_system_compositor_disconnect_session (DisplayServer *display_server, Session *session)196unity_system_compositor_disconnect_session (DisplayServer *display_server, Session *session)
197{197{
198 session_unset_env (session, "XDG_SESSION_TYPE");198 session_unset_env (session, "XDG_SESSION_TYPE");
199 session_unset_env (session, "MIR_SOCKET");199 session_unset_env (session, "MIR_SERVER_HOST_SOCKET");
200 session_unset_env (session, "MIR_SERVER_NAME");200 session_unset_env (session, "MIR_SERVER_NAME");
201 session_unset_env (session, "XDG_VTNR");201 session_unset_env (session, "XDG_VTNR");
202}202}
203203
=== modified file 'tests/src/test-gobject-greeter.c'
--- tests/src/test-gobject-greeter.c 2015-07-28 08:38:40 +0000
+++ tests/src/test-gobject-greeter.c 2016-06-07 16:19:18 +0000
@@ -407,7 +407,7 @@
407int407int
408main (int argc, char **argv)408main (int argc, char **argv)
409{409{
410 gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *mir_socket, *mir_vt, *mir_id, *path;410 gchar *display, *xdg_seat, *xdg_vtnr, *xdg_session_cookie, *xdg_session_class, *xdg_session_type, *mir_server_host_socket, *mir_vt, *mir_id, *path;
411 GString *status_text;411 GString *status_text;
412412
413#if !defined(GLIB_VERSION_2_36)413#if !defined(GLIB_VERSION_2_36)
@@ -420,7 +420,7 @@
420 xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");420 xdg_session_cookie = getenv ("XDG_SESSION_COOKIE");
421 xdg_session_class = getenv ("XDG_SESSION_CLASS");421 xdg_session_class = getenv ("XDG_SESSION_CLASS");
422 xdg_session_type = getenv ("XDG_SESSION_TYPE"); 422 xdg_session_type = getenv ("XDG_SESSION_TYPE");
423 mir_socket = getenv ("MIR_SOCKET");423 mir_server_host_socket = getenv ("MIR_SERVER_HOST_SOCKET");
424 mir_vt = getenv ("MIR_SERVER_VT");424 mir_vt = getenv ("MIR_SERVER_VT");
425 mir_id = getenv ("MIR_SERVER_NAME");425 mir_id = getenv ("MIR_SERVER_NAME");
426 if (display)426 if (display)
@@ -432,7 +432,7 @@
432 }432 }
433 else if (mir_id)433 else if (mir_id)
434 greeter_id = g_strdup_printf ("GREETER-MIR-%s", mir_id);434 greeter_id = g_strdup_printf ("GREETER-MIR-%s", mir_id);
435 else if (mir_socket || mir_vt)435 else if (mir_server_host_socket || mir_vt)
436 greeter_id = g_strdup ("GREETER-MIR");436 greeter_id = g_strdup ("GREETER-MIR");
437 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)437 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)
438 greeter_id = g_strdup ("GREETER-WAYLAND");438 greeter_id = g_strdup ("GREETER-WAYLAND");
439439
=== modified file 'tests/src/test-session.c'
--- tests/src/test-session.c 2015-07-28 08:38:40 +0000
+++ tests/src/test-session.c 2016-06-07 16:19:18 +0000
@@ -229,7 +229,7 @@
229int229int
230main (int argc, char **argv)230main (int argc, char **argv)
231{231{
232 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;232 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;
233 GString *status_text;233 GString *status_text;
234 int fd, open_max;234 int fd, open_max;
235235
@@ -242,7 +242,7 @@
242 xdg_session_class = getenv ("XDG_SESSION_CLASS");242 xdg_session_class = getenv ("XDG_SESSION_CLASS");
243 xdg_session_type = getenv ("XDG_SESSION_TYPE");243 xdg_session_type = getenv ("XDG_SESSION_TYPE");
244 xdg_session_desktop = getenv ("XDG_SESSION_DESKTOP");244 xdg_session_desktop = getenv ("XDG_SESSION_DESKTOP");
245 mir_socket = getenv ("MIR_SOCKET");245 mir_server_host_socket = getenv ("MIR_SERVER_HOST_SOCKET");
246 mir_vt = getenv ("MIR_SERVER_VT");246 mir_vt = getenv ("MIR_SERVER_VT");
247 mir_id = getenv ("MIR_SERVER_NAME");247 mir_id = getenv ("MIR_SERVER_NAME");
248 if (display)248 if (display)
@@ -254,7 +254,7 @@
254 }254 }
255 else if (mir_id)255 else if (mir_id)
256 session_id = g_strdup_printf ("SESSION-MIR-%s", mir_id);256 session_id = g_strdup_printf ("SESSION-MIR-%s", mir_id);
257 else if (mir_socket || mir_vt)257 else if (mir_server_host_socket || mir_vt)
258 session_id = g_strdup ("SESSION-MIR");258 session_id = g_strdup ("SESSION-MIR");
259 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)259 else if (g_strcmp0 (xdg_session_type, "wayland") == 0)
260 session_id = g_strdup ("SESSION-WAYLAND");260 session_id = g_strdup ("SESSION-WAYLAND");

Subscribers

People subscribed via source and target branches