Remove ConsoleKit support since upstream is long dead. Please migrate to logind or use LightDM 1.10 if ConsoleKit support is required.

1 files changed, 6 insertions, 34 deletions

diff --git a/src/session.c b/src/session.c
index c0729df3..7b5fcf9a 100644
--- a/src/session.c
+++ b/src/session.c
@@ -23,7 +23,6 @@
 
 #include "session.h"
 #include "configuration.h"
-#include "console-kit.h"
 #include "login1.h"
 #include "guest-account.h"
 #include "shared-data-manager.h"
@@ -96,9 +95,6 @@ struct SessionPrivate
     /* Remote host this session is being controlled from */
     gchar *remote_host_name;
 
-    /* Console kit cookie */
-    gchar *console_kit_cookie;
-
     /* login1 session ID */
     gchar *login1_session_id;
 
@@ -652,13 +648,6 @@ session_get_username (Session *session)
     return session->priv->username;
 }
 
-const gchar *
-session_get_console_kit_cookie (Session *session)
-{
-    g_return_val_if_fail (session != NULL, NULL);
-    return session->priv->console_kit_cookie;
-}
-
 void
 session_respond (Session *session, struct pam_response *response)
 {
@@ -806,46 +795,30 @@ session_real_run (Session *session)
         write_string (session, session->priv->argv[i]);
 
     session->priv->login1_session_id = read_string_from_child (session);
-    session->priv->console_kit_cookie = read_string_from_child (session);
 }
 
 void
 session_lock (Session *session)
 {
     g_return_if_fail (session != NULL);
-    if (getuid () == 0)
-    {
-        if (session->priv->login1_session_id)
-            login1_service_lock_session (login1_service_get_instance (), session->priv->login1_session_id);
-        else if (session->priv->console_kit_cookie)
-            ck_lock_session (session->priv->console_kit_cookie);
-    }
+    if (getuid () == 0 && session->priv->login1_session_id)
+        login1_service_lock_session (login1_service_get_instance (), session->priv->login1_session_id);
 }
 
 void
 session_unlock (Session *session)
 {
     g_return_if_fail (session != NULL);
-    if (getuid () == 0)
-    {
-        if (session->priv->login1_session_id)
-            login1_service_unlock_session (login1_service_get_instance (), session->priv->login1_session_id);
-        else if (session->priv->console_kit_cookie)
-            ck_unlock_session (session->priv->console_kit_cookie);
-    }
+    if (getuid () == 0 && session->priv->login1_session_id)
+        login1_service_unlock_session (login1_service_get_instance (), session->priv->login1_session_id);
 }
 
 void
 session_activate (Session *session)
 {
     g_return_if_fail (session != NULL);
-    if (getuid () == 0)
-    {
-        if (session->priv->login1_session_id)
-            login1_service_activate_session (login1_service_get_instance (), session->priv->login1_session_id);
-        else if (session->priv->console_kit_cookie)
-            ck_activate_session (session->priv->console_kit_cookie);
-    }
+    if (getuid () == 0 && session->priv->login1_session_id)
+        login1_service_activate_session (login1_service_get_instance (), session->priv->login1_session_id);
 }
 
 void
@@ -938,7 +911,6 @@ session_finalize (GObject *object)
         g_object_unref (self->priv->x_authority);
     g_free (self->priv->remote_host_name);
     g_free (self->priv->login1_session_id);
-    g_free (self->priv->console_kit_cookie);
     g_list_free_full (self->priv->env, g_free);
     g_strfreev (self->priv->argv);