summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2014-03-06 17:15:28 -0500
committerJasper St. Pierre <jstpierre@mecheye.net>2014-03-07 08:35:34 -0500
commit7cf2ad24442da28ba925522971597a60d76009db (patch)
tree51b9df0d3e439543404a578f38f6f786417a1a5a /daemon
parentb062e7b2c67e7e242bee2ef47a05332a578f29c4 (diff)
downloadgdm-7cf2ad24442da28ba925522971597a60d76009db.tar.gz
server: Kill off some dead code
Diffstat (limited to 'daemon')
-rw-r--r--daemon/gdm-server.c41
1 files changed, 0 insertions, 41 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index fe012a26..250ecc68 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -252,47 +252,6 @@ gdm_server_launch_sigusr1_thread_if_needed (void)
}
}
-/* We keep a connection (parent_dsp) open with the parent X server
- * before running a proxy on it to prevent the X server resetting
- * as we open and close other connections.
- * Note that XDMCP servers, by default, reset when the seed X
- * connection closes whereas usually the X server only quits when
- * all X connections have closed.
- */
-#if 0
-static gboolean
-connect_to_parent (GdmServer *server)
-{
- int maxtries;
- int openretries;
-
- g_debug ("GdmServer: Connecting to parent display \'%s\'",
- d->parent_disp);
-
- d->parent_dsp = NULL;
-
- maxtries = SERVER_IS_XDMCP (d) ? 10 : 2;
-
- openretries = 0;
- while (openretries < maxtries &&
- d->parent_dsp == NULL) {
- d->parent_dsp = XOpenDisplay (d->parent_disp);
-
- if G_UNLIKELY (d->parent_dsp == NULL) {
- g_debug ("GdmServer: Sleeping %d on a retry", 1+openretries*2);
- gdm_sleep_no_signal (1+openretries*2);
- openretries++;
- }
- }
-
- if (d->parent_dsp == NULL)
- gdm_error (_("%s: failed to connect to parent display \'%s\'"),
- "gdm_server_start", d->parent_disp);
-
- return d->parent_dsp != NULL;
-}
-#endif
-
static void
gdm_server_init_command (GdmServer *server)
{