[gdm] server: call ck-x11-get-display-device even w/o WITH_CONSOLE_KIT



commit eea6e0e7e9c4f2ec893e1d3c5bb8f30f2d91148a
Author: Ray Strode <rstrode redhat com>
Date:   Mon Mar 19 18:10:47 2012 -0400

    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.

 daemon/gdm-server.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
---
diff --git a/daemon/gdm-server.c b/daemon/gdm-server.c
index 4bbc3cc..d0d8ff9 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);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]