diff options
| -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]); |