From 5d4fb658b7c75a0496d3b6f6ff62fa0062b81944 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Fri, 17 Jun 2011 13:39:21 -0400 Subject: Revert some commits I had some inprogress changes in my local tree when when git bz applying the patches on bug 618047. Those unfinished changes got interleaved into the commits, creating a bit of a mess. Also, bug 618047 has been reopened. This commit reverts those changes for now until. --- daemon/gdm-server.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'daemon/gdm-server.c') diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c index a995a034..62ffca13 100644 --- a/daemon/gdm-server.c +++ b/daemon/gdm-server.c @@ -52,12 +52,6 @@ extern char **environ; -#ifdef WITH_VT_SWITCH_WORKAROUND -#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7" -#else -#define X_SERVER_COMMAND_LINE X_SERVER " -br -verbose -logverbose 7 -novtswitch" -#endif - #define GDM_SERVER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_SERVER, GdmServerPrivate)) /* These are the servstat values, also used as server @@ -933,7 +927,7 @@ gdm_server_init (GdmServer *server) server->priv = GDM_SERVER_GET_PRIVATE (server); server->priv->pid = -1; - server->priv->command = g_strdup (X_SERVER_COMMAND_LINE); + server->priv->command = g_strdup (X_SERVER " -br -verbose -logverbose 7"); server->priv->log_dir = g_strdup (LOGDIR); add_ready_handler (server); -- cgit v1.2.1