diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-09-19 11:11:12 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-09-19 11:14:31 -0400 |
| commit | 90f653cf3f1b962033db74c6203fd93296d339ca (patch) | |
| tree | f88de0c6525f0f16ed278a7385a9b97986b28c05 | |
| parent | a91cc3516328ee5df51f2f25cc118c95bc5995c0 (diff) | |
| download | gdm-90f653cf3f1b962033db74c6203fd93296d339ca.tar.gz | |
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
| -rw-r--r-- | daemon/gdm-manager.c | 2 | ||||
| -rw-r--r-- | libgdm/gdm-sessions.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c index a5fd1597..e9f8465f 100644 --- a/daemon/gdm-manager.c +++ b/daemon/gdm-manager.c @@ -2394,7 +2394,7 @@ create_user_session_for_display (GdmManager *manager, (GDestroyNotify) clean_user_session); -#ifdef ENABLE_WAYLAND_SUPPORT +#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER) greeter_is_wayland = g_strcmp0 (display_session_type, "wayland") == 0; g_object_set (G_OBJECT (session), "ignore-wayland", !greeter_is_wayland, NULL); #endif 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]); |