diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-02-16 10:30:09 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-02-17 23:48:07 -0500 |
| commit | 20b935a9593629b21949d03b200da81c7c20fab2 (patch) | |
| tree | 527f4307e5a3ee31bb4153dd74712d31391724cd | |
| parent | c34754f6131e3a717a52aab56a8368f0be0de7b3 (diff) | |
| download | gdm-20b935a9593629b21949d03b200da81c7c20fab2.tar.gz | |
worker: don't require --enable-wayland to support logind display mode
Now that the logind display mode is supported for X servers, we
shouldn't cull the code when --disable-wayland is passed to
configure.
| -rw-r--r-- | daemon/gdm-session-worker.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/daemon/gdm-session-worker.c b/daemon/gdm-session-worker.c index ce3137a5..a1f6ab8c 100644 --- a/daemon/gdm-session-worker.c +++ b/daemon/gdm-session-worker.c @@ -28,7 +28,7 @@ #include <string.h> #include <sys/types.h> #include <sys/wait.h> -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD #include <sys/ioctl.h> #include <sys/vt.h> #endif @@ -956,7 +956,7 @@ gdm_session_worker_stop_auditor (GdmSessionWorker *worker) worker->priv->auditor = NULL; } -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD static void jump_to_vt (GdmSessionWorker *worker, int vt_number) @@ -1004,7 +1004,7 @@ gdm_session_worker_uninitialize_pam (GdmSessionWorker *worker, gdm_session_worker_stop_auditor (worker); -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD if (worker->priv->login_vt != worker->priv->session_vt) { jump_to_vt (worker, worker->priv->login_vt); } @@ -1811,7 +1811,7 @@ gdm_session_worker_start_session (GdmSessionWorker *worker, error_code = PAM_SUCCESS; -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD /* If we're in new vt mode, jump to the new vt now. There's no need to jump for * the other two modes: in the logind case, the session will activate itself when * ready, and in the reuse server case, we're already on the correct VT. */ @@ -2003,7 +2003,7 @@ gdm_session_worker_start_session (GdmSessionWorker *worker, return TRUE; } -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD static gboolean set_up_for_new_vt (GdmSessionWorker *worker) { @@ -2146,7 +2146,7 @@ gdm_session_worker_open_session (GdmSessionWorker *worker, return FALSE; } break; -#ifdef ENABLE_WAYLAND_SUPPORT +#ifdef WITH_SYSTEMD case GDM_SESSION_DISPLAY_MODE_NEW_VT: case GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED: if (!set_up_for_new_vt (worker)) { |