summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2015-01-30 13:41:38 -0500
committerRay Strode <rstrode@redhat.com>2015-02-16 22:06:21 -0500
commit37a728909b6ea9ee2e091b1c68e800770bcb3e47 (patch)
treeb9d89192c23360800c742c9373b9dd08651f3d1b
parentfbfc39b2a08b39256e6fbab20ae5a29a9fb3a97f (diff)
downloadgdm-37a728909b6ea9ee2e091b1c68e800770bcb3e47.tar.gz
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.
-rw-r--r--daemon/gdm-manager.c28
-rw-r--r--daemon/gdm-manager.h2
2 files changed, 2 insertions, 28 deletions
diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index fa3563e6..ab07e139 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;
@@ -2065,13 +2064,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));
@@ -2082,29 +2081,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 4482bdd1..41c68a7a 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);