[gdm/wip/kill-x-on-login-too-plz: 2/4] session: avoid wayland session type when ignoring wayland sessions

[Ray Strode <halfline src gnome org>]

commit 2d6bd107fface30cca9c0b4f495708edb47d0a8f
Author: rpm-build <rpm-build>
Date:   Mon Oct 8 15:18:07 2018 -0400

    session: avoid wayland session type when ignoring wayland sessions
    
    If a session is supposed to ignore wayland sessions, we at the moment,
    still sometimes set the session type to "wayland".
    
    This commit fixes that.

 daemon/gdm-session.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index 04f879a7..269d4a3a 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -3078,9 +3078,11 @@ static void
 update_session_type (GdmSession *self)
 {
 #ifdef ENABLE_WAYLAND_SUPPORT
-        gboolean is_wayland_session;
+        gboolean is_wayland_session = FALSE;
+
+        if (!self->priv->ignore_wayland)
+                is_wayland_session = gdm_session_is_wayland_session (self);
 
-        is_wayland_session = gdm_session_is_wayland_session (self);
         if (is_wayland_session) {
                 set_session_type (self, "wayland");
         } else {