summaryrefslogtreecommitdiff
path: root/daemon/gdm-server.c
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2012-03-19 18:10:47 -0400
committerRay Strode <rstrode@redhat.com>2012-03-19 18:10:47 -0400
commiteea6e0e7e9c4f2ec893e1d3c5bb8f30f2d91148a (patch)
tree9de16e8b16d6bd71d011c39948fd560c8b8b71d6 /daemon/gdm-server.c
parentac435f3d46dcc799a3ce16438e664d89278597a6 (diff)
downloadgdm-eea6e0e7e9c4f2ec893e1d3c5bb8f30f2d91148a.tar.gz
server: call ck-x11-get-display-device even w/o WITH_CONSOLE_KIT
ck-x11-get-display-device is a soft dependency. If it's installed then pam_ck_connector will function properly, otherwise it won't. Since it's a soft dependencies, we should do it even if building --disable-console-kit . This allows distros to drop the ConsoleKit buildrequires and still keep support for consolekit via pam_ck_connector.
Diffstat (limited to 'daemon/gdm-server.c')
-rw-r--r--daemon/gdm-server.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 4bbc3cce..d0d8ff9e 100644
--- a/daemon/gdm-server.c
+++ b/daemon/gdm-server.c
@@ -172,9 +172,6 @@ gdm_server_get_display_device (GdmServer *server)
}
#endif
-#ifndef WITH_CONSOLE_KIT
- return NULL;
-#endif
if (server->priv->display_device == NULL) {
server->priv->display_device =
_gdm_server_query_ck_for_display_device (server);