git.iko.soy/unity8
on xenial help sign in
register the screensaver iface also on the compat /ScreenSaver path
commit1b4804e9e08f02c7200232eca903fbce4f554f54 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 18 Jun 2015, 20:38 (11 years ago) parent11c5dd3
2 files changed+6−1
compare with xenial
unifiedsplit
plugins/Unity/Session/dbusunitysessionservice.cpp+1 tests/plugins/Unity/Session/sessionbackendtest.cpp+5−1
plugins/Unity/Session/dbusunitysessionservice.cpp+1
@@ -432,6 +432,7 @@ void DBusGnomeScreensaverWrapper::SimulateUserActivity()
432432DBusScreensaverWrapper::DBusScreensaverWrapper()
433433 : UnityDBusObject("/org/freedesktop/ScreenSaver", "org.freedesktop.ScreenSaver")
434434{
435+ QDBusConnection::sessionBus().registerObject("/ScreenSaver", this, QDBusConnection::ExportScriptableContents); // compat path, also register here
435436 connect(d, &DBusUnitySessionServicePrivate::screensaverActiveChanged, this, &DBusScreensaverWrapper::ActiveChanged);
436437}
437438
tests/plugins/Unity/Session/sessionbackendtest.cpp+5−1
@@ -159,8 +159,12 @@ private Q_SLOTS:
159159// void testLock() {
160160// DBusUnitySessionService dbusUnitySessionService;
161161// DBusScreensaverWrapper saverIface;
162+// QDBusInterface saverCompatIface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver", QDBusConnection::sessionBus());
162163// QSignalSpy spy(&saverIface, &DBusScreensaverWrapper::ActiveChanged);
163164// QCoreApplication::processEvents(); // to let the service register on DBus
165+
166+// QTRY_COMPARE(saverCompatIface.isValid(), true);
167+
164168// qDebug() << "Locking up...";
165169// dbusUnitySessionService.Lock();
166170
@@ -174,7 +178,7 @@ private Q_SLOTS:
174178// sleep(5);
175179// qDebug() << "Screensaver has been active for" << saverIface.GetActiveTime() << "seconds";
176180// qDebug() << "Session has been idle for" << saverIface.GetSessionIdleTime() << "seconds";
177−// }
181+ }
178182
179183private:
180184 QDBusInterface *dbusUnitySession;