summaryrefslogtreecommitdiff
path: root/daemon/gdm-local-display.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2018-08-31 15:52:07 -0400
committerRay Strode <rstrode@redhat.com>2018-08-31 17:05:53 -0400
commit365c58c0f4e4488496283005c5f800c27ad15d7c (patch)
tree6c18d742f6ee00de5b6a4239e736d7b1dbd1511c /daemon/gdm-local-display.c
parentc274ef84f51ed8a33d9ce286d6fd594e5808b315 (diff)
downloadgdm-365c58c0f4e4488496283005c5f800c27ad15d7c.tar.gz
launch-environment: use wayland for initial-setup
While we've been using wayland by default for the login screen for a long time, and for the user session for somewhat less time, we never switched initial setup over. It's still using X11 for no good reason. This commit changes initial-setup to use wayland by default like everything else.
Diffstat (limited to 'daemon/gdm-local-display.c')
-rw-r--r--daemon/gdm-local-display.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/daemon/gdm-local-display.c b/daemon/gdm-local-display.c
index b1ed2bc8..3b682262 100644
--- a/daemon/gdm-local-display.c
+++ b/daemon/gdm-local-display.c
@@ -110,11 +110,6 @@ gdm_local_display_prepare (GdmDisplay *display)
}
g_debug ("doing initial setup? %s", doing_initial_setup? "yes" : "no");
- if (doing_initial_setup && g_strcmp0 (session_type, "wayland") == 0) {
- g_debug ("initial setup doesn't have a wayland session, failing back to X11");
- failed = TRUE;
- goto out;
- }
if (!doing_initial_setup) {
launch_environment = gdm_create_greeter_launch_environment (NULL,
@@ -124,9 +119,10 @@ gdm_local_display_prepare (GdmDisplay *display)
TRUE);
} else {
launch_environment = gdm_create_initial_setup_launch_environment (NULL,
- seat_id,
- NULL,
- TRUE);
+ seat_id,
+ session_type,
+ NULL,
+ TRUE);
}
g_object_set (self, "launch-environment", launch_environment, NULL);