[gdm/wip/kill-x-on-login-too-plz: 214/214] manager: don't kill initial-setup right away with Xorg either

[Ray Strode <halfline src gnome org>]

commit 89cbd8eaed69306e4f1e68bbe35a7370803f97df
Author: Ray Strode <rstrode redhat com>
Date:   Mon Jul 13 09:23:06 2020 -0400

    manager: don't kill initial-setup right away with Xorg either
    
    The login screen for both Xorg and wayland sessions is now silently
    killed in the background post login.
    
    We still kill initial-setup for Xorg sessions up front, though.
    
    This commit fixes that.

 daemon/gdm-manager.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index efcce9b6..3249cb9e 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -1781,9 +1781,6 @@ on_start_user_session (StartUserSessionOperation *operation)
         gboolean doing_initial_setup = FALSE;
         GdmDisplay *display;
         const char *session_id;
-#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
-        g_autofree char *display_session_type = NULL;
-#endif
 
         g_debug ("GdmManager: start or jump to session");
 
@@ -1808,9 +1805,6 @@ on_start_user_session (StartUserSessionOperation *operation)
 
         g_object_get (G_OBJECT (display),
                       "doing-initial-setup", &doing_initial_setup,
-#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
-                      "session-type", &display_session_type,
-#endif
                       NULL);
 
         if (doing_initial_setup)
@@ -1835,18 +1829,8 @@ on_start_user_session (StartUserSessionOperation *operation)
                 if (doing_initial_setup) {
                         g_autoptr(GError) error = NULL;
 
-#if defined(ENABLE_WAYLAND_SUPPORT) && defined(ENABLE_USER_DISPLAY_SERVER)
-                        if (g_strcmp0 (display_session_type, "wayland") == 0) {
-                                g_debug ("GdmManager: closing down initial setup display in background");
-                                g_object_set (G_OBJECT (display), "status", GDM_DISPLAY_WAITING_TO_FINISH, 
NULL);
-                        }
-#endif
-                        if (gdm_display_get_status (display) == GDM_DISPLAY_MANAGED) {
-                                g_debug ("GdmManager: closing down initial setup display");
-                                gdm_display_stop_greeter_session (display);
-                                gdm_display_unmanage (display);
-                                gdm_display_finish (display);
-                        }
+                        g_debug ("GdmManager: closing down initial setup display in background");
+                        g_object_set (G_OBJECT (display), "status", GDM_DISPLAY_WAITING_TO_FINISH, NULL);
 
                         if (!g_file_set_contents (ALREADY_RAN_INITIAL_SETUP_ON_THIS_BOOT,
                                                   "1",