From a430eeeaa7fc67ce7548d4e05d797c4f53971974 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 12 Jan 2017 15:05:06 +1300 Subject: Use liblightdm-gobject power methods instead of re-implementing in Qt, only run power fallback tests once --- liblightdm-qt/power.cpp | 113 +++----------------------------- tests/Makefile.am | 21 ++---- tests/test-power-no-console-kit | 2 + tests/test-power-no-console-kit-gobject | 2 - tests/test-power-no-console-kit-python | 2 - tests/test-power-no-console-kit-qt4 | 2 - tests/test-power-no-console-kit-qt5 | 2 - tests/test-power-no-login1 | 2 + tests/test-power-no-login1-gobject | 2 - tests/test-power-no-login1-python | 2 - tests/test-power-no-login1-qt4 | 2 - tests/test-power-no-login1-qt5 | 2 - tests/test-power-no-services | 2 + tests/test-power-no-services-gobject | 2 - tests/test-power-no-services-python | 2 - tests/test-power-no-services-qt4 | 2 - tests/test-power-no-services-qt5 | 2 - 17 files changed, 22 insertions(+), 142 deletions(-) create mode 100755 tests/test-power-no-console-kit delete mode 100755 tests/test-power-no-console-kit-gobject delete mode 100755 tests/test-power-no-console-kit-python delete mode 100755 tests/test-power-no-console-kit-qt4 delete mode 100755 tests/test-power-no-console-kit-qt5 create mode 100755 tests/test-power-no-login1 delete mode 100755 tests/test-power-no-login1-gobject delete mode 100755 tests/test-power-no-login1-python delete mode 100755 tests/test-power-no-login1-qt4 delete mode 100755 tests/test-power-no-login1-qt5 create mode 100755 tests/test-power-no-services delete mode 100755 tests/test-power-no-services-gobject delete mode 100755 tests/test-power-no-services-python delete mode 100755 tests/test-power-no-services-qt4 delete mode 100755 tests/test-power-no-services-qt5 diff --git a/liblightdm-qt/power.cpp b/liblightdm-qt/power.cpp index a8cb4fae..bcebcdd1 100644 --- a/liblightdm-qt/power.cpp +++ b/liblightdm-qt/power.cpp @@ -12,12 +12,7 @@ #include "QLightDM/power.h" -#include -#include -#include -#include - -#include "config.h" +#include using namespace QLightDM; @@ -25,15 +20,9 @@ class PowerInterface::PowerInterfacePrivate { public: PowerInterfacePrivate(); - QScopedPointer powerManagementInterface; - QScopedPointer consoleKitInterface; - QScopedPointer 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 reply = d->login1Interface->call("CanSuspend"); - if (reply.isValid()) - { - return reply.value() == "yes"; - } - } - - qWarning() << d->login1Interface->lastError(); - - QDBusReply reply = d->powerManagementInterface->call("SuspendAllowed"); - if (reply.isValid()) { - return reply.value(); - } - else { - return false; - } + return lightdm_get_can_suspend (); } bool PowerInterface::suspend() { - QDBusReply 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 reply = d->login1Interface->call("CanHibernate"); - if (reply.isValid()) - { - return reply.value() == "yes"; - } - } - - qWarning() << d->login1Interface->lastError(); - - QDBusReply reply = d->powerManagementInterface->call("HibernateAllowed"); - if (reply.isValid()) { - return reply.value(); - } - else { - return false; - } + return lightdm_get_can_hibernate (); } bool PowerInterface::hibernate() { - QDBusReply 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 reply1 = d->login1Interface->call("CanPowerOff"); - if (reply1.isValid()) { - return reply1.value() == "yes"; - } - } - qWarning() << d->login1Interface->lastError(); - - QDBusReply reply = d->consoleKitInterface->call("CanStop"); - if (reply.isValid()) { - return reply.value(); - } - - return false; + return lightdm_get_can_shutdown (); } bool PowerInterface::shutdown() { - QDBusReply 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 reply1 = d->login1Interface->call("CanReboot"); - if (reply1.isValid()) { - return reply1.value() == "yes"; - } - } - qWarning() << d->login1Interface->lastError(); - - QDBusReply reply = d->consoleKitInterface->call("CanRestart"); - if (reply.isValid()) { - return reply.value(); - } - - return false; + return lightdm_get_can_restart (); } bool PowerInterface::restart() { - QDBusReply 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 78a46691..3973c94f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -217,9 +217,9 @@ TESTS = \ test-no-login1 \ test-no-console-kit-or-login1 \ test-power-gobject \ - test-power-no-console-kit-gobject \ - test-power-no-login1-gobject \ - test-power-no-services-gobject \ + test-power-no-console-kit \ + test-power-no-login1 \ + test-power-no-services \ test-open-file-descriptors \ test-xdmcp-server-open-file-descriptors \ test-add-local-x-seat \ @@ -304,10 +304,7 @@ TESTS += \ test-login-remote-session-python \ test-autologin-timeout-python \ test-autologin-guest-timeout-python \ - test-power-python \ - test-power-no-console-kit-python \ - test-power-no-login1-python \ - test-power-no-services-python + test-power-python if COMPILE_LIBLIGHTDM_QT4 TESTS += \ @@ -340,10 +337,7 @@ TESTS += \ test-login-guest-logout-qt4 \ test-login-remote-session-qt4 \ test-users-qt4 \ - test-power-qt4 \ - test-power-no-console-kit-qt4 \ - test-power-no-login1-qt4 \ - test-power-no-services-qt4 + test-power-qt4 endif if COMPILE_LIBLIGHTDM_QT5 @@ -377,10 +371,7 @@ TESTS += \ test-login-guest-logout-qt5 \ test-login-remote-session-qt5 \ test-users-qt5 \ - test-power-qt5 \ - test-power-no-console-kit-qt5 \ - test-power-no-login1-qt5 \ - test-power-no-services-qt5 + test-power-qt5 endif EXTRA_DIST = \ diff --git a/tests/test-power-no-console-kit b/tests/test-power-no-console-kit new file mode 100755 index 00000000..3bd175c3 --- /dev/null +++ b/tests/test-power-no-console-kit @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner power-no-console-kit test-gobject-greeter diff --git a/tests/test-power-no-console-kit-gobject b/tests/test-power-no-console-kit-gobject deleted file mode 100755 index 3bd175c3..00000000 --- a/tests/test-power-no-console-kit-gobject +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-console-kit test-gobject-greeter diff --git a/tests/test-power-no-console-kit-python b/tests/test-power-no-console-kit-python deleted file mode 100755 index 71361084..00000000 --- a/tests/test-power-no-console-kit-python +++ /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-power-no-console-kit-qt4 b/tests/test-power-no-console-kit-qt4 deleted file mode 100755 index 91df1a1c..00000000 --- a/tests/test-power-no-console-kit-qt4 +++ /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-power-no-console-kit-qt5 b/tests/test-power-no-console-kit-qt5 deleted file mode 100755 index f8d2718f..00000000 --- a/tests/test-power-no-console-kit-qt5 +++ /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-power-no-login1 b/tests/test-power-no-login1 new file mode 100755 index 00000000..c59b8886 --- /dev/null +++ b/tests/test-power-no-login1 @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner power-no-login1 test-gobject-greeter diff --git a/tests/test-power-no-login1-gobject b/tests/test-power-no-login1-gobject deleted file mode 100755 index c59b8886..00000000 --- a/tests/test-power-no-login1-gobject +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-login1 test-gobject-greeter diff --git a/tests/test-power-no-login1-python b/tests/test-power-no-login1-python deleted file mode 100755 index 526abc22..00000000 --- a/tests/test-power-no-login1-python +++ /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-power-no-login1-qt4 b/tests/test-power-no-login1-qt4 deleted file mode 100755 index 929176f5..00000000 --- a/tests/test-power-no-login1-qt4 +++ /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-power-no-login1-qt5 b/tests/test-power-no-login1-qt5 deleted file mode 100755 index 6fe86895..00000000 --- a/tests/test-power-no-login1-qt5 +++ /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-power-no-services b/tests/test-power-no-services new file mode 100755 index 00000000..bf0b47ea --- /dev/null +++ b/tests/test-power-no-services @@ -0,0 +1,2 @@ +#!/bin/sh +./src/dbus-env ./src/test-runner power-no-services test-gobject-greeter diff --git a/tests/test-power-no-services-gobject b/tests/test-power-no-services-gobject deleted file mode 100755 index bf0b47ea..00000000 --- a/tests/test-power-no-services-gobject +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-services test-gobject-greeter diff --git a/tests/test-power-no-services-python b/tests/test-power-no-services-python deleted file mode 100755 index fa3381a9..00000000 --- a/tests/test-power-no-services-python +++ /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-power-no-services-qt4 b/tests/test-power-no-services-qt4 deleted file mode 100755 index 866c5772..00000000 --- a/tests/test-power-no-services-qt4 +++ /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-power-no-services-qt5 b/tests/test-power-no-services-qt5 deleted file mode 100755 index a0a39bdc..00000000 --- a/tests/test-power-no-services-qt5 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -./src/dbus-env ./src/test-runner power-no-services test-qt5-greeter -- cgit v1.2.1