Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kscreensaver: register object at /org/freedesktop/ScreenSaver too and unregister service and objects from destructor

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-04-19 05:03:15 +03:00
parent a876e29ef6
commit 630cd79180
2 changed files with 34 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
kscreensaver/kscreensaver.cpp
View file

@ -26,24 +26,35 @@ static const uint ChangeScreenSettings = 4;
KScreenSaver::KScreenSaver(QObject *parent)
: QObject(parent),
m_objectsregistered(false),
m_serviceregistered(false),
m_xscreensaver(nullptr)
{
(void)new ScreenSaverAdaptor(this);
QDBusConnection connection = QDBusConnection::sessionBus();
const bool object = connection.registerObject("/ScreenSaver", this);
if (object) {
const bool service = connection.registerService("org.freedesktop.ScreenSaver");
if (service) {
kDebug() << "kscreensaver is online";
} else {
kWarning() << "Could not register service" << connection.lastError().message();
return;
}
} else {
const bool object = connection.registerObject("/ScreenSaver", this); // used by e.g. xdg-screensaver
if (!object) {
kWarning() << "Could not register object" << connection.lastError().message();
return;
}
const bool object2 = connection.registerObject("/org/freedesktop/ScreenSaver", this); // used by e.g. chromium
if (!object2) {
kWarning() << "Could not register second object" << connection.lastError().message();
connection.unregisterObject("/ScreenSaver");
return;
}
m_objectsregistered = true;
const bool service = connection.registerService("org.freedesktop.ScreenSaver");
if (!service) {
kWarning() << "Could not register service" << connection.lastError().message();
connection.unregisterObject("/ScreenSaver");
connection.unregisterObject("/org/freedesktop/ScreenSaver");
return;
}
m_serviceregistered = true;
QProcess::startDetached(
QString::fromLatin1("xscreensaver"),
@ -61,6 +72,17 @@ KScreenSaver::KScreenSaver(QObject *parent)
KScreenSaver::~KScreenSaver()
{
if (m_serviceregistered) {
QDBusConnection connection = QDBusConnection::sessionBus();
connection.unregisterService("org.freedesktop.ScreenSaver");
}
if (m_objectsregistered) {
QDBusConnection connection = QDBusConnection::sessionBus();
connection.unregisterObject("/ScreenSaver");
connection.unregisterObject("/org/freedesktop/ScreenSaver");
}
if (m_xscreensaver) {
disconnect(m_xscreensaver, SIGNAL(readyReadStandardOutput()), this, SLOT(slotXScreenSaverOutput()));
disconnect(m_xscreensaver, SIGNAL(readyReadStandardError()), this, SLOT(slotXScreenSaverError()));

2
kscreensaver/kscreensaver.h
View file

@ -53,6 +53,8 @@ private Q_SLOTS:
void slotXScreenSaverError();
private:
bool m_objectsregistered;
bool m_serviceregistered;
QProcess* m_xscreensaver;
QElapsedTimer m_activetimer;
QList<uint> m_inhibitions;