[gdm/gnome-3-22] session: honor ignore-wayland flag

commit e8b7f83118cd64ae844f8071c32a6254905fe778
Author: Ray Strode <rstrode redhat com>
Date:   Fri Mar 3 13:32:38 2017 -0500

    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.

 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 70130ac..e69291f 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));
+                if (!self->priv->ignore_wayland) {
-                g_array_prepend_val (search_array, wayland_search_dir);
+                        g_array_prepend_val (search_array, wayland_search_dir);
-                g_array_append_val (search_array, wayland_search_dir);
+                        g_array_append_val (search_array, wayland_search_dir);
+                }

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]