[gdm/wip/wayland-at-login-screen: 2/2] wip: session: run wayland unconditionally for login screen

[Ray Strode <halfline src gnome org>]

commit dad7afd00f617d29c18d5d4cbff5c27486131d11
Author: Ray Strode <rstrode redhat com>
Date:   Mon Feb 16 23:53:13 2015 -0500

    wip: session: run wayland unconditionally for login screen
    
    This is a work in progress, it needs to be more intelligent
    and conditional.

 daemon/gdm-launch-environment.c |    2 +-
 daemon/gdm-session.c            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/daemon/gdm-launch-environment.c b/daemon/gdm-launch-environment.c
index d09409b..c38b44f 100644
--- a/daemon/gdm-launch-environment.c
+++ b/daemon/gdm-launch-environment.c
@@ -990,7 +990,7 @@ gdm_create_greeter_launch_environment (const char *display_name,
                                        const char *display_hostname,
                                        gboolean    display_is_local)
 {
-        return create_gnome_session_environment (NULL,
+        return create_gnome_session_environment ("gnome-wayland",
                                                  GDM_USERNAME,
                                                  display_name,
                                                  seat_id,
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index d1f70be..5150294 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -2823,7 +2823,7 @@ gdm_session_is_wayland_session (GdmSession *self)
 
         g_return_val_if_fail (self != NULL, FALSE);
         g_return_val_if_fail (GDM_IS_SESSION (self), FALSE);
-
+        if (self->priv->is_program_session) return TRUE;
         filename = get_session_filename (self);
 
         key_file = load_key_file_for_file (filename, &full_path);