From ef3e23fd2a8a8dd4c5dcff2d4352148e25dad9e1 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 18 Aug 2025 15:58:11 +0900 Subject: kdesktop: simplify duplicated code Signed-off-by: Michele Calgaro --- kdesktop/lockeng.cpp | 24 +----------------------- kdesktop/lockeng.h | 1 - 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/kdesktop/lockeng.cpp b/kdesktop/lockeng.cpp index 3de190484..8cd6731f4 100644 --- a/kdesktop/lockeng.cpp +++ b/kdesktop/lockeng.cpp @@ -502,28 +502,6 @@ void SaverEngine::lockProcessFullyActivatedGUI() } } -void SaverEngine::lockProcessWaitingGUI() -{ - emitDCOPSignal("KDE_stop_screensaver()", TQByteArray()); - if (mEnabled) - { - if (mXAutoLock) - { - mXAutoLock->start(); - } - XForceScreenSaver(tqt_xdisplay(), ScreenSaverReset); - XSetScreenSaver(tqt_xdisplay(), mTimeout + 10, mXInterval, PreferBlanking, mXExposures); - } - processLockTransactions(); - - if (systemdSession && systemdSession->canSend()) - { - TQValueList params; - params << TQT_DBusData::fromBool(false); - TQT_DBusMessage reply = systemdSession->sendWithReply("SetIdleHint", params); - } -} - // XAutoLock has detected the required idle time. void SaverEngine::idleTimeout() { @@ -764,7 +742,7 @@ void SaverEngineEventHandler::lockProcessExited() } m_state = Waiting; - TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(lockProcessWaitingGUI())); + TQTimer::singleShot(0, m_saverEngine, TQ_SLOT(stopLockProcessGUI())); } void SaverEngineEventHandler::lockProcessFullyActivated() diff --git a/kdesktop/lockeng.h b/kdesktop/lockeng.h index 94d8f9e44..1dfff54c3 100644 --- a/kdesktop/lockeng.h +++ b/kdesktop/lockeng.h @@ -144,7 +144,6 @@ private slots: // in 'SaverEngineEventHandler' to complete the remaining X11 part of the actions void activateSaverOrLockGUI(); void lockProcessFullyActivatedGUI(); - void lockProcessWaitingGUI(); void lockScreenGUI(); void stopLockProcessGUI(); -- cgit v1.2.3