[gdm/wip/slave-display-merger: 24/29] manager: drop wait-for-go

[Ray Strode <halfline src gnome org>]

commit b50e5d862584745157b5320c793ab0c041957b6e
Author: Ray Strode <rstrode redhat com>
Date:   Fri Jan 30 13:41:38 2015 -0500

    manager: drop wait-for-go
    
    GDM used to have this concept called "wait-for-go" where it would
    stall at boot up and wait for a go signal before proceeding. This
    feature never got fully reimplemented after the rewrite in '22 and
    and it's not used anyway.
    
    Drop it.

 daemon/gdm-manager.c             |   28 ++--------------------------
 daemon/gdm-manager.h             |    2 --
 daemon/gdm-xdmcp-chooser-slave.c |    2 --
 3 files changed, 2 insertions(+), 30 deletions(-)
---
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index af755f3..155b998 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -78,7 +78,6 @@ struct GdmManagerPrivate
         GCancellable           *cancellable;
 
         gboolean                started;
-        gboolean                wait_for_go;
         gboolean                show_local_greeter;
 
         GDBusProxy               *bus_proxy;
@@ -2037,13 +2036,13 @@ gdm_manager_start (GdmManager *manager)
 {
         g_debug ("GdmManager: GDM starting to manage displays");
 
-        if (! manager->priv->wait_for_go && (!manager->priv->xdmcp_enabled || 
manager->priv->show_local_greeter)) {
+        if (!manager->priv->xdmcp_enabled || manager->priv->show_local_greeter) {
                 gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->local_factory));
         }
 
 #ifdef HAVE_LIBXDMCP
         /* Accept remote connections */
-        if (manager->priv->xdmcp_enabled && ! manager->priv->wait_for_go) {
+        if (manager->priv->xdmcp_enabled) {
                 if (manager->priv->xdmcp_factory != NULL) {
                         g_debug ("GdmManager: Accepting XDMCP connections...");
                         gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
@@ -2054,29 +2053,6 @@ gdm_manager_start (GdmManager *manager)
         manager->priv->started = TRUE;
 }
 
-void
-gdm_manager_set_wait_for_go (GdmManager *manager,
-                             gboolean    wait_for_go)
-{
-        if (manager->priv->wait_for_go != wait_for_go) {
-                manager->priv->wait_for_go = wait_for_go;
-
-                if (! wait_for_go) {
-                        /* we got a go */
-                        if (!manager->priv->xdmcp_enabled || manager->priv->show_local_greeter) {
-                                gdm_display_factory_start (GDM_DISPLAY_FACTORY 
(manager->priv->local_factory));
-                        }
-
-#ifdef HAVE_LIBXDMCP
-                        if (manager->priv->xdmcp_enabled && manager->priv->xdmcp_factory != NULL) {
-                                g_debug ("GdmManager: Accepting XDMCP connections...");
-                                gdm_display_factory_start (GDM_DISPLAY_FACTORY 
(manager->priv->xdmcp_factory));
-                        }
-#endif
-                }
-        }
-}
-
 static gboolean
 register_manager (GdmManager *manager)
 {
diff --git a/daemon/gdm-manager.h b/daemon/gdm-manager.h
index 4482bdd..41c68a7 100644
--- a/daemon/gdm-manager.h
+++ b/daemon/gdm-manager.h
@@ -66,8 +66,6 @@ GType               gdm_manager_get_type                       (void);
 GdmManager *        gdm_manager_new                            (void);
 void                gdm_manager_start                          (GdmManager *manager);
 void                gdm_manager_stop                           (GdmManager *manager);
-void                gdm_manager_set_wait_for_go                (GdmManager *manager,
-                                                                gboolean    wait_for_go);
 
 void                gdm_manager_set_xdmcp_enabled              (GdmManager *manager,
                                                                 gboolean    enabled);
diff --git a/daemon/gdm-xdmcp-chooser-slave.c b/daemon/gdm-xdmcp-chooser-slave.c
index da26a95..828bffe 100644
--- a/daemon/gdm-xdmcp-chooser-slave.c
+++ b/daemon/gdm-xdmcp-chooser-slave.c
@@ -288,8 +288,6 @@ idle_connect_to_display (GdmXdmcpChooserSlave *slave)
 
         res = gdm_slave_connect_to_x11_display (GDM_SLAVE (slave));
         if (res) {
-                /* FIXME: handle wait-for-go */
-
                 setup_server (slave);
                 run_chooser (slave);
         } else {