diff options
| author | Ray Strode <rstrode@redhat.com> | 2011-06-17 13:39:21 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2011-06-17 13:45:01 -0400 |
| commit | 5d4fb658b7c75a0496d3b6f6ff62fa0062b81944 (patch) | |
| tree | 4434e5472a4d7828b6d2a67a1fb786a877dd1de4 /daemon/gdm-server.c | |
| parent | b7d107a0156f3c7e07524175d9d27e2d868b58ff (diff) | |
| download | gdm-5d4fb658b7c75a0496d3b6f6ff62fa0062b81944.tar.gz | |
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.
Diffstat (limited to 'daemon/gdm-server.c')
| -rw-r--r-- | daemon/gdm-server.c | 8 |
1 files changed, 1 insertions, 7 deletions
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); |