Revert removal of ConsoleKit support.

ConsoleKit has recently been forked for XFCE and Illumos is using ConsoleKit + LightDM.

http://lists.freedesktop.org/archives/lightdm/2014-November/000731.html

Author: robert-ancell

debian/control

@@ -47,12 +47,11 @@ Conflicts: liblightdm-gobject-0-0,
            liblightdm-qt-0-0,
 Provides: x-display-manager
 Description: Display Manager
- LightDM is a display manager that:
-  * Is cross-desktop - supports different desktops
-  * Supports different display technologies
-  * Is lightweight - low memory usage and fast performance
-  * Has a comprehensive test suite
-  * Has low code complexity
+ LightDM is a X display manager that:
+  * Has a lightweight codebase
+  * Is standards compliant (PAM, ConsoleKit, etc)
+  * Has a well defined interface between the server and user interface
+  * Cross-desktop (greeters can be written in any toolkit)
 
 Package: liblightdm-gobject-1-0
 Architecture: any

liblightdm-gobject/power.c

@@ -16,6 +16,7 @@
 #include "lightdm/power.h"
 
 static GDBusProxy *upower_proxy = NULL;
+static GDBusProxy *ck_proxy = NULL;
 static GDBusProxy *login1_proxy = NULL;
 
 static GVariant *
@@ -204,6 +205,36 @@ lightdm_hibernate (GError **error)
     return hibernated;
 }
 
+static GVariant *
+ck_call_function (const gchar *function, GError **error)
+{
+    GVariant *r;
+
+    if (!ck_proxy)
+    {
+        ck_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+                                                  G_DBUS_PROXY_FLAGS_NONE,
+                                                  NULL,
+                                                  "org.freedesktop.ConsoleKit",
+                                                  "/org/freedesktop/ConsoleKit/Manager",
+                                                  "org.freedesktop.ConsoleKit.Manager",
+                                                  NULL,
+                                                  error);
+        if (!ck_proxy)
+            return FALSE;
+    }
+
+    r = g_dbus_proxy_call_sync (ck_proxy,
+                                function,
+                                NULL,
+                                G_DBUS_CALL_FLAGS_NONE,
+                                -1,
+                                NULL,
+                                error);
+
+    return r;
+}
+
 /**
  * lightdm_get_can_restart:
  *
@@ -226,8 +257,15 @@ lightdm_get_can_restart (void)
             g_variant_get (r, "(&s)", &result);
             can_restart = g_strcmp0 (result, "yes") == 0;
         }
+    }
+    else
+    {
+        r = ck_call_function ("CanRestart", NULL);
+        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
+            g_variant_get (r, "(b)", &can_restart);
+    }
+    if (r)
         g_variant_unref (r);
-    }  
 
     return can_restart;
 }
@@ -244,15 +282,19 @@ gboolean
 lightdm_restart (GError **error)
 {
     GVariant *r;
+    gboolean restarted;
 
     r = login1_call_function ("Reboot", g_variant_new("(b)", FALSE), error);
-    if (r)
+    if (!r)
     {
-        g_variant_unref (r);
-        return TRUE;
+        g_clear_error (error);
+        r = ck_call_function ("Restart", error);
     }
+    restarted = r != NULL;
+    if (r)
+        g_variant_unref (r);
 
-    return FALSE;
+    return restarted;
 }
 
 /**
@@ -277,8 +319,15 @@ lightdm_get_can_shutdown (void)
             g_variant_get (r, "(&s)", &result);
             can_shutdown = g_strcmp0 (result, "yes") == 0;
         }
-        g_variant_unref (r);
     }
+    else
+    {
+        r = ck_call_function ("CanStop", NULL);
+        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
+            g_variant_get (r, "(b)", &can_shutdown);
+    }
+    if (r)
+        g_variant_unref (r);
 
     return can_shutdown;
 }
@@ -295,13 +344,17 @@ gboolean
 lightdm_shutdown (GError **error)
 {
     GVariant *r;
+    gboolean shutdown;
 
     r = login1_call_function ("PowerOff", g_variant_new("(b)", FALSE), error);
-    if (r)
+    if (!r)
     {
-        g_variant_unref (r);
-        return TRUE;
+        g_clear_error (error);
+        r = ck_call_function ("Stop", error);
     }
+    shutdown = r != NULL;
+    if (r)
+        g_variant_unref (r);
 
-    return FALSE;
+    return shutdown;
 }

liblightdm-qt/power.cpp

@@ -26,11 +26,13 @@ class PowerInterface::PowerInterfacePrivate
 public:
     PowerInterfacePrivate();
     QScopedPointer<QDBusInterface> powerManagementInterface;
+    QScopedPointer<QDBusInterface> consoleKitInterface;
     QScopedPointer<QDBusInterface> login1Interface;
 };
 
 PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() :
     powerManagementInterface(new QDBusInterface("org.freedesktop.UPower","/org/freedesktop/UPower", "org.freedesktop.UPower", QDBusConnection::systemBus())),
+    consoleKitInterface(new QDBusInterface("org.freedesktop.ConsoleKit", "/org/freedesktop/ConsoleKit/Manager", "org.freedesktop.ConsoleKit.Manager", QDBusConnection::systemBus())),
     login1Interface(new QDBusInterface("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", QDBusConnection::systemBus()))
 {
 }
@@ -115,9 +117,17 @@ bool PowerInterface::hibernate()
 
 bool PowerInterface::canShutdown()
 {
-    QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
-    if (reply1.isValid()) {
-        return reply1.value() == "yes";
+    if (d->login1Interface->isValid()) {
+        QDBusReply<QString> reply1 = d->login1Interface->call("CanPowerOff");
+        if (reply1.isValid()) {
+            return reply1.value() == "yes";
+        }
+    }
+    qWarning() << d->login1Interface->lastError();
+
+    QDBusReply<bool> reply = d->consoleKitInterface->call("CanStop");
+    if (reply.isValid()) {
+        return reply.value();
     }
 
     return false;
@@ -126,15 +136,26 @@ bool PowerInterface::canShutdown()
 bool PowerInterface::shutdown()
 {
     QDBusReply<void> reply;
-    reply = d->login1Interface->call("PowerOff", false);
+    if (d->login1Interface->isValid())
+        reply = d->login1Interface->call("PowerOff", false);
+    else
+        reply = d->consoleKitInterface->call("Stop");
     return reply.isValid();
 }
 
 bool PowerInterface::canRestart()
 {
-    QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
-    if (reply1.isValid()) {
-        return reply1.value() == "yes";
+    if (d->login1Interface->isValid()) {
+        QDBusReply<QString> reply1 = d->login1Interface->call("CanReboot");
+        if (reply1.isValid()) {
+            return reply1.value() == "yes";
+        }
+    }
+    qWarning() << d->login1Interface->lastError();
+
+    QDBusReply<bool> reply = d->consoleKitInterface->call("CanRestart");
+    if (reply.isValid()) {
+        return reply.value();
     }
 
     return false;
@@ -143,7 +164,10 @@ bool PowerInterface::canRestart()
 bool PowerInterface::restart()
 {
     QDBusReply<void> reply;
-    reply = d->login1Interface->call("Reboot", false);
+    if (d->login1Interface->isValid())
+        reply = d->login1Interface->call("Reboot", false);
+    else
+        reply = d->consoleKitInterface->call("Restart");
     return reply.isValid();
 }
 

src/Makefile.am

@@ -4,6 +4,8 @@ bin_PROGRAMS = dm-tool
 lightdm_SOURCES = \
 	accounts.c \
 	accounts.h \
+	console-kit.c \
+	console-kit.h \
 	display-manager.c \
 	display-manager.h \
 	display-server.c \