From 90f653cf3f1b962033db74c6203fd93296d339ca Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 19 Sep 2017 11:11:12 -0400 Subject: daemon,libgdm: allow wayland sessions with --disable-user-display-server Right now we hide wayland sessions from the list if the greeter isn't wayland. The greeter is never wayland if built with --disable-user-display-server. This commit allows wayland sessions for the user session, when --disable-user-display-server --enable-wayland-support is specified, even though the greeter won't use wayland itself. https://bugzilla.gnome.org/show_bug.cgi?id=787899 --- libgdm/gdm-sessions.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libgdm') diff --git a/libgdm/gdm-sessions.c b/libgdm/gdm-sessions.c index a645224b..4a5434ed 100644 --- a/libgdm/gdm-sessions.c +++ b/libgdm/gdm-sessions.c @@ -213,9 +213,11 @@ collect_sessions (void) } #ifdef ENABLE_WAYLAND_SUPPORT +#ifdef ENABLE_USER_DISPLAY_SERVER if (g_getenv ("WAYLAND_DISPLAY") == NULL && g_getenv ("RUNNING_UNDER_GDM") != NULL) { return; } +#endif for (i = 0; wayland_search_dirs [i] != NULL; i++) { collect_sessions_from_directory (wayland_search_dirs [i]); -- cgit v1.2.1