[frameworks/kwallet] src/runtime/ksecretd: Drop dead screensaver integration

Git commit c67e7dcb37fa0a51aa2d5ce3fd5a02c93628f558 by Nicolas Fella.
Committed on 24/07/2026 at 12:32.
Pushed by nicolasfella into branch 'master'.

Drop dead screensaver integration

Q_WS_X11 isn't defined, so this code hasn't been built for years

M  +0    -1    src/runtime/ksecretd/autotests/mockkwalletd.cpp
M  +0    -45   src/runtime/ksecretd/ksecretd.cpp
M  +0    -9    src/runtime/ksecretd/ksecretd.h

https://invent.kde.org/frameworks/kwallet/-/commit/c67e7dcb37fa0a51aa2d5ce3fd5a02c93628f558

diff --git a/src/runtime/ksecretd/autotests/mockkwalletd.cpp b/src/runtime/ksecretd/autotests/mockkwalletd.cpp
index ed2ebe6f..95062efd 100644
--- a/src/runtime/ksecretd/autotests/mockkwalletd.cpp
+++ b/src/runtime/ksecretd/autotests/mockkwalletd.cpp
@@ -118,7 +118,6 @@ MOCK_FUNCTION(KSecretD, sync, 2, );
 MOCK_FUNCTION(KSecretD, changePassword, 3, );
 MOCK_FUNCTION(KSecretD, reconfigure, 0, );
 MOCK_FUNCTION(KSecretD, closeAllWallets, 0, );
-MOCK_FUNCTION(KSecretD, screenSaverChanged, 1, );
 
 void KSecretD::slotServiceOwnerChanged(const QString &, const QString &, const QString &)
 {
diff --git a/src/runtime/ksecretd/ksecretd.cpp b/src/runtime/ksecretd/ksecretd.cpp
index a3e74da4..7ec15155 100644
--- a/src/runtime/ksecretd/ksecretd.cpp
+++ b/src/runtime/ksecretd/ksecretd.cpp
@@ -145,10 +145,6 @@ KSecretD::KSecretD()
         new KWalletPortalSecrets(this);
     }
 
-#ifdef Q_WS_X11
-    screensaver = 0;
-#endif
-
     reconfigure();
     //  KGlobal::dirs()->addResourceType("kwallet", 0, "share/apps/kwallet");
     _dw = new KDirWatch(this);
@@ -168,10 +164,6 @@ KSecretD::KSecretD()
 
 KSecretD::~KSecretD()
 {
-#ifdef Q_WS_X11
-    delete screensaver;
-    screensaver = 0;
-#endif
     closeAllWallets();
     qDeleteAll(_transactions);
 }
@@ -186,21 +178,6 @@ QString KSecretD::decodeWalletName(const QString &mangledName)
     return KWallet::Backend::decodeWalletName(mangledName);
 }
 
-#ifdef Q_WS_X11
-void KSecretD::connectToScreenSaver()
-{
-    screensaver = new QDBusInterface("org.freedesktop.ScreenSaver", "/ScreenSaver", "org.freedesktop.ScreenSaver");
-    if (!screensaver->isValid()) {
-        qCDebug(KSECRETD_LOG) << "Service org.freedesktop.ScreenSaver not found. Retrying in 10 seconds...";
-        // keep attempting every 10 seconds
-        QTimer::singleShot(10000, this, SLOT(connectToScreenSaver()));
-    } else {
-        connect(screensaver, SIGNAL(ActiveChanged(bool)), SLOT(screenSaverChanged(bool)));
-        qCDebug(KSECRETD_LOG) << "connected to screen saver service.";
-    }
-}
-#endif
-
 int KSecretD::generateHandle()
 {
     int rc;
@@ -1693,21 +1670,6 @@ void KSecretD::reconfigure()
     int timeSave = _idleTime;
     // in minutes!
     _idleTime = walletGroup.readEntry("Idle Timeout", 10) * 60 * 1000;
-#ifdef Q_WS_X11
-    if (walletGroup.readEntry("Close on Screensaver", false)) {
-        // BUG 254273 : if KSecretD starts before the screen saver, then the
-        // connection fails and KSecretD never receives it's notifications
-        // To fix this, we use a timer and perform periodic connection
-        // attempts until connection succeeds
-        QTimer::singleShot(0, this, SLOT(connectToScreenSaver()));
-    } else {
-        if (screensaver && screensaver->isValid()) {
-            screensaver->disconnect(SIGNAL(ActiveChanged(bool)), this, SLOT(screenSaverChanged(bool)));
-            delete screensaver;
-            screensaver = 0;
-        }
-    }
-#endif
     // Handle idle changes
     if (_closeIdle) {
         if (_idleTime != timeSave) { // Timer length changed
@@ -1846,13 +1808,6 @@ QString KSecretD::localWallet()
     return KWallet::Wallet::LocalWallet();
 }
 
-void KSecretD::screenSaverChanged(bool s)
-{
-    if (s) {
-        closeAllWallets();
-    }
-}
-
 void KSecretD::activatePasswordDialog()
 {
     checkActiveDialog();
diff --git a/src/runtime/ksecretd/ksecretd.h b/src/runtime/ksecretd/ksecretd.h
index d250af2f..7c10bbbb 100644
--- a/src/runtime/ksecretd/ksecretd.h
+++ b/src/runtime/ksecretd/ksecretd.h
@@ -164,8 +164,6 @@ public Q_SLOTS:
 
     QString localWallet();
 
-    void screenSaverChanged(bool);
-
     // Open a wallet using a pre-hashed password. This is only useful in cooperation
     // with the kwallet PAM module. It's also less secure than manually entering the
     // password as the password hash is transmitted using D-Bus.
@@ -201,9 +199,6 @@ private Q_SLOTS:
     void notifyFailures();
     void processTransactions();
     void activatePasswordDialog();
-#ifdef Q_WS_X11
-    void connectToScreenSaver();
-#endif
 
 private:
     // Internal - open a wallet
@@ -255,10 +250,6 @@ private:
     QList<KWalletTransaction *> _transactions;
     QPointer<QWidget> activeDialog;
 
-#ifdef Q_WS_X11
-    QDBusInterface *screensaver;
-#endif
-
     // sessions
     KWalletSessionStore _sessions;
     QDBusServiceWatcher _serviceWatcher;