diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2017-01-12 15:29:29 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@canonical.com> | 2017-01-12 15:29:29 +1300 |
commit | 3a3d953cfaeb2f467310abb04d6f4aa24632447b (patch) | |
tree | 7a9092262c1f76768866c40888b79dadc3ba6ed6 | |
parent | fe4fb7bba874c87641e972bcfbbe9dd1954434c5 (diff) | |
download | lightdm-git-3a3d953cfaeb2f467310abb04d6f4aa24632447b.tar.gz |
Use liblightdm-gobject power methods instead of re-implementing in Qt, only run power fallback tests once
-rw-r--r-- | liblightdm-qt/power.cpp | 113 | ||||
-rw-r--r-- | tests/Makefile.am | 21 | ||||
-rwxr-xr-x | tests/test-power-no-console-kit (renamed from tests/test-gobject-power-no-console-kit) | 0 | ||||
-rwxr-xr-x | tests/test-power-no-login1 (renamed from tests/test-gobject-power-no-login1) | 0 | ||||
-rwxr-xr-x | tests/test-power-no-services (renamed from tests/test-gobject-power-no-services) | 0 | ||||
-rwxr-xr-x | tests/test-python-power-no-console-kit | 2 | ||||
-rwxr-xr-x | tests/test-python-power-no-login1 | 2 | ||||
-rwxr-xr-x | tests/test-python-power-no-services | 2 | ||||
-rwxr-xr-x | tests/test-qt4-power-no-console-kit | 2 | ||||
-rwxr-xr-x | tests/test-qt4-power-no-login1 | 2 | ||||
-rwxr-xr-x | tests/test-qt4-power-no-services | 2 | ||||
-rwxr-xr-x | tests/test-qt5-power-no-console-kit | 2 | ||||
-rwxr-xr-x | tests/test-qt5-power-no-login1 | 2 | ||||
-rwxr-xr-x | tests/test-qt5-power-no-services | 2 |
14 files changed, 16 insertions, 136 deletions
diff --git a/liblightdm-qt/power.cpp b/liblightdm-qt/power.cpp index eb0c82cd..bcebcdd1 100644 --- a/liblightdm-qt/power.cpp +++ b/liblightdm-qt/power.cpp @@ -12,12 +12,7 @@ #include "QLightDM/power.h" -#include <QtCore/QVariant> -#include <QtDBus/QDBusInterface> -#include <QtDBus/QDBusReply> -#include <QDebug> - -#include "config.h" +#include <lightdm.h> using namespace QLightDM; @@ -25,15 +20,9 @@ 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())) +PowerInterface::PowerInterfacePrivate::PowerInterfacePrivate() { } @@ -51,124 +40,42 @@ PowerInterface::~PowerInterface() bool PowerInterface::canSuspend() { - if (d->login1Interface->isValid()) - { - QDBusReply<QString> reply = d->login1Interface->call("CanSuspend"); - if (reply.isValid()) - { - return reply.value() == "yes"; - } - } - - qWarning() << d->login1Interface->lastError(); - - QDBusReply<bool> reply = d->powerManagementInterface->call("SuspendAllowed"); - if (reply.isValid()) { - return reply.value(); - } - else { - return false; - } + return lightdm_get_can_suspend (); } bool PowerInterface::suspend() { - QDBusReply<void> reply; - if (d->login1Interface->isValid()) - reply = d->login1Interface->call("Suspend", false); - else - reply = d->powerManagementInterface->call("Suspend"); - - return reply.isValid (); + return lightdm_suspend (NULL); } bool PowerInterface::canHibernate() { - if (d->login1Interface->isValid()) - { - QDBusReply<QString> reply = d->login1Interface->call("CanHibernate"); - if (reply.isValid()) - { - return reply.value() == "yes"; - } - } - - qWarning() << d->login1Interface->lastError(); - - QDBusReply<bool> reply = d->powerManagementInterface->call("HibernateAllowed"); - if (reply.isValid()) { - return reply.value(); - } - else { - return false; - } + return lightdm_get_can_hibernate (); } bool PowerInterface::hibernate() { - QDBusReply<void> reply; - if (d->login1Interface->isValid()) - reply = d->login1Interface->call("Hibernate", false); - else - reply = d->powerManagementInterface->call("Hibernate"); - - return reply.isValid (); + return lightdm_hibernate (NULL); } bool PowerInterface::canShutdown() { - 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; + return lightdm_get_can_shutdown (); } bool PowerInterface::shutdown() { - QDBusReply<void> reply; - if (d->login1Interface->isValid()) - reply = d->login1Interface->call("PowerOff", false); - else - reply = d->consoleKitInterface->call("Stop"); - return reply.isValid(); + return lightdm_shutdown (NULL); } bool PowerInterface::canRestart() { - 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; + return lightdm_get_can_restart (); } bool PowerInterface::restart() { - QDBusReply<void> reply; - if (d->login1Interface->isValid()) - reply = d->login1Interface->call("Reboot", false); - else - reply = d->consoleKitInterface->call("Restart"); - return reply.isValid(); + return lightdm_restart (NULL); } #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) diff --git a/tests/Makefile.am b/tests/Makefile.am index f08d3b1c..a4ba67ce 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -194,9 +194,9 @@ TESTS = \ test-no-login1 \ test-no-console-kit-or-login1 \ test-gobject-power \ - test-gobject-power-no-console-kit \ - test-gobject-power-no-login1 \ - test-gobject-power-no-services \ + test-power-no-console-kit \ + test-power-no-login1 \ + test-power-no-services \ test-open-file-descriptors \ test-xdmcp-server-open-file-descriptors \ test-multi-seat \ @@ -273,10 +273,7 @@ TESTS += \ test-login-python-remote-session \ test-autologin-python-timeout \ test-autologin-python-guest-timeout \ - test-python-power \ - test-python-power-no-console-kit \ - test-python-power-no-login1 \ - test-python-power-no-services + test-python-power if COMPILE_LIBLIGHTDM_QT4 TESTS += \ @@ -309,10 +306,7 @@ TESTS += \ test-login-qt4-guest-logout \ test-login-qt4-remote-session \ test-users-qt4 \ - test-qt4-power \ - test-qt4-power-no-console-kit \ - test-qt4-power-no-login1 \ - test-qt4-power-no-services + test-qt4-power endif if COMPILE_LIBLIGHTDM_QT5 @@ -346,10 +340,7 @@ TESTS += \ test-login-qt5-guest-logout \ test-login-qt5-remote-session \ test-users-qt5 \ - test-qt5-power \ - test-qt5-power-no-console-kit \ - test-qt5-power-no-login1 \ - test-qt5-power-no-services + test-qt5-power endif EXTRA_DIST = \ diff --git a/tests/test-gobject-power-no-console-kit b/tests/test-power-no-console-kit index 3bd175c3..3bd175c3 100755 --- a/tests/test-gobject-power-no-console-kit +++ b/tests/test-power-no-console-kit diff --git a/tests/test-gobject-power-no-login1 b/tests/test-power-no-login1 index c59b8886..c59b8886 100755 --- a/tests/test-gobject-power-no-login1 +++ b/tests/test-power-no-login1 diff --git a/tests/test-gobject-power-no-services b/tests/test-power-no-services index bf0b47ea..bf0b47ea 100755 --- a/tests/test-gobject-power-no-services +++ b/tests/test-power-no-services diff --git a/tests/test-python-power-no-console-kit b/tests/test-python-power-no-console-kit deleted file mode 100755 index 71361084..00000000 --- a/tests/test-python-power-no-console-kit +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-console-kit test-python-greeter diff --git a/tests/test-python-power-no-login1 b/tests/test-python-power-no-login1 deleted file mode 100755 index 526abc22..00000000 --- a/tests/test-python-power-no-login1 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-login1 test-python-greeter diff --git a/tests/test-python-power-no-services b/tests/test-python-power-no-services deleted file mode 100755 index fa3381a9..00000000 --- a/tests/test-python-power-no-services +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-services test-python-greeter diff --git a/tests/test-qt4-power-no-console-kit b/tests/test-qt4-power-no-console-kit deleted file mode 100755 index 91df1a1c..00000000 --- a/tests/test-qt4-power-no-console-kit +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-console-kit test-qt4-greeter diff --git a/tests/test-qt4-power-no-login1 b/tests/test-qt4-power-no-login1 deleted file mode 100755 index 929176f5..00000000 --- a/tests/test-qt4-power-no-login1 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-login1 test-qt4-greeter diff --git a/tests/test-qt4-power-no-services b/tests/test-qt4-power-no-services deleted file mode 100755 index 866c5772..00000000 --- a/tests/test-qt4-power-no-services +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-services test-qt4-greeter diff --git a/tests/test-qt5-power-no-console-kit b/tests/test-qt5-power-no-console-kit deleted file mode 100755 index f8d2718f..00000000 --- a/tests/test-qt5-power-no-console-kit +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-console-kit test-qt5-greeter diff --git a/tests/test-qt5-power-no-login1 b/tests/test-qt5-power-no-login1 deleted file mode 100755 index 6fe86895..00000000 --- a/tests/test-qt5-power-no-login1 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-login1 test-qt5-greeter diff --git a/tests/test-qt5-power-no-services b/tests/test-qt5-power-no-services deleted file mode 100755 index a0a39bdc..00000000 --- a/tests/test-qt5-power-no-services +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-services test-qt5-greeter |