[frameworks/kwallet] src/runtime/kwalletd: Drop kwalletmanager launching from kwalletd

Nicolas Fella <[email protected]> Wed, 5 Aug 2026 10:37:14 +0000 (UTC)
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit 7d761258243a2ccb7ba90c3a894a38bdbe8e6b2c by Nicolas Fella.
Committed on 05/08/2026 at 10:24.
Pushed by nicolasfella into branch 'master'.

Drop kwalletmanager launching from kwalletd

Currently both kwalletd and ksecretd have code to launch
kwalletmanager at startup. That doesn't make sense.

Remove it from kwalletd since that is supposed to be
only a thin bridge.

M  +0    -14   src/runtime/kwalletd/kwalletd.cpp
M  +0    -1    src/runtime/kwalletd/kwalletd.h

https://invent.kde.org/frameworks/kwallet/-/commit/7d761258243a2ccb7ba90c3a894a38bdbe8e6b2c

diff --git a/src/runtime/kwalletd/kwalletd.cpp b/src/runtime/kwalletd/kwalletd.cpp
index 9b477827..bb03f347 100644
--- a/src/runtime/kwalletd/kwalletd.cpp
+++ b/src/runtime/kwalletd/kwalletd.cpp
@@ -21,15 +21,6 @@
 
 unsigned int KWalletD::s_lastTransaction = 0;
 
-static void startManagerForKwalletd()
-{
-    if (!QStandardPaths::findExecutable(QStringLiteral("kstart")).isEmpty()) {
-        QProcess::startDetached(QStringLiteral("kstart"), {QStringLiteral("--application"), QStringLiteral("kwalletmanager5-kwalletd")});
-    } else {
-        QProcess::startDetached(QStringLiteral("kwalletmanager5"), QStringList{QStringLiteral("--kwalletd")});
-    }
-}
-
 KWalletD::KWalletD(QObject *parent)
     : QObject(parent)
 {
@@ -998,7 +989,6 @@ void KWalletD::reconfigure()
 
     const bool wasEnabled = m_enabled;
     m_enabled = settings.kWalletDEnabled();
-    m_launchManager = settings.launchManager();
     const bool closeIdle = m_closeIdle;
     m_closeIdle = settings.closeWhenIdle();
     const int idleTime = m_idleTime;
@@ -1030,10 +1020,6 @@ void KWalletD::reconfigure()
             *it = (startTimer(m_idleTime));
         }
     }
-
-    if (m_launchManager) {
-        startManagerForKwalletd();
-    }
 }
 
 bool KWalletD::folderDoesNotExist(const QString &wallet, const QString &folder)
diff --git a/src/runtime/kwalletd/kwalletd.h b/src/runtime/kwalletd/kwalletd.h
index 4f4f237e..2c7faa76 100644
--- a/src/runtime/kwalletd/kwalletd.h
+++ b/src/runtime/kwalletd/kwalletd.h
@@ -198,7 +198,6 @@ private:
     QHash<QPair<int, QString>, int> m_idleTimers;
 
     bool m_enabled = true;
-    bool m_launchManager = false;
     bool m_closeIdle = false;
     // in minutes
     int m_idleTime = 10 * 60 * 1000;