diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-03-03 13:32:38 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-03-03 13:34:39 -0500 |
| commit | 0f693f5a3b4bcdc1efe578c3618a4cb66a24a929 (patch) | |
| tree | 53d08693fc0f311535fccfe6b9dc0c2612f7640a /daemon/gdm-session.c | |
| parent | 1e55359b6ee6ad688245a62ca59749ef5620f9b7 (diff) | |
| download | gdm-0f693f5a3b4bcdc1efe578c3618a4cb66a24a929.tar.gz | |
session: honor ignore-wayland flag
commit 5b1e625417c274823c66a552f37d912986fc34d8 changed how the
default session path was computed. It inadvertently dropped
support for the ignore-wayland flag, breaking fall back to X in
scenarios where wayland doesn't work.
This commit fixes the code to again honor ignore-wayland.
https://bugzilla.gnome.org/show_bug.cgi?id=779338
Diffstat (limited to 'daemon/gdm-session.c')
| -rw-r--r-- | daemon/gdm-session.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c index 70130ac2..e69291fb 100644 --- a/daemon/gdm-session.c +++ b/daemon/gdm-session.c @@ -358,11 +358,13 @@ get_system_session_dirs (GdmSession *self) g_array_append_vals (search_array, x_search_dirs, G_N_ELEMENTS (x_search_dirs)); #ifdef ENABLE_WAYLAND_SUPPORT + if (!self->priv->ignore_wayland) { #ifdef ENABLE_USER_DISPLAY_SERVER - g_array_prepend_val (search_array, wayland_search_dir); + g_array_prepend_val (search_array, wayland_search_dir); #else - g_array_append_val (search_array, wayland_search_dir); + g_array_append_val (search_array, wayland_search_dir); #endif + } #endif } |