diff options
| author | Ray Strode <rstrode@redhat.com> | 2017-03-03 13:32:38 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2017-03-03 15:31:20 -0500 |
| commit | e8b7f83118cd64ae844f8071c32a6254905fe778 (patch) | |
| tree | 68db10ac6ba93cfdbdd5ad92ef604eddedf3e572 | |
| parent | 56e1445854564b0c4508b9e386a552a1a37fdbd3 (diff) | |
| download | gdm-e8b7f83118cd64ae844f8071c32a6254905fe778.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
| -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 } |