From ecef0ed675996b71979c18c81fe107f394915434 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 12 May 2024 14:08:08 +0300 Subject: [PATCH] kinit: remove exec_blind method from the D-Bus interface no longer used by any other program Signed-off-by: Ivailo Monev --- kinit/klauncher_adaptor.cpp | 49 ++++++++++++++++++------------------- kinit/klauncher_adaptor.h | 2 +- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/kinit/klauncher_adaptor.cpp b/kinit/klauncher_adaptor.cpp index 3b2b7fe0..41879ff8 100644 --- a/kinit/klauncher_adaptor.cpp +++ b/kinit/klauncher_adaptor.cpp @@ -237,8 +237,7 @@ void KLauncherAdaptor::autoStart(int phase) continue; } const QString program = programandargs.takeFirst(); - const QStringList programargs = programandargs; - exec_blind(program, programargs); + startDetached(program, programandargs); } switch (phase) { case 0: { @@ -260,29 +259,6 @@ void KLauncherAdaptor::autoStart(int phase) } } -void KLauncherAdaptor::exec_blind(const QString &name, const QStringList &args) -{ - const QString appexe = findExe(name); - if (appexe.isEmpty()) { - kWarning() << "could not find" << name; - return; - } - - const QStringList envlist = m_environment.toStringList(); - kDebug() << "blind starting" << appexe << args << envlist; - const QString envexe = findExe("env"); - if (envexe.isEmpty()) { - kWarning() << "env program not found"; - QProcess::startDetached(appexe, args); - return; - } - - QStringList envargs = envlist; - envargs += appexe; - envargs += args; - QProcess::startDetached(envexe, envargs); -} - void KLauncherAdaptor::cleanup() { kDebug() << "terminating processes" << m_processes.size(); @@ -444,6 +420,29 @@ QString KLauncherAdaptor::findExe(const QString &app) const return KStandardDirs::findExe(app, environmentpath); } +void KLauncherAdaptor::startDetached(const QString &name, const QStringList &args) +{ + const QString appexe = findExe(name); + if (appexe.isEmpty()) { + kWarning() << "could not find" << name; + return; + } + + const QStringList envlist = m_environment.toStringList(); + kDebug() << "blind starting" << appexe << args << envlist; + const QString envexe = findExe("env"); + if (envexe.isEmpty()) { + kWarning() << "env program not found"; + QProcess::startDetached(appexe, args); + return; + } + + QStringList envargs = envlist; + envargs += appexe; + envargs += args; + QProcess::startDetached(envexe, envargs); +} + bool KLauncherAdaptor::startProgram(const QString &app, const QStringList &args, const QStringList &envs, const quint64 window, const bool temp, const QString &workdir, const qint64 timeout, const KService::Ptr kservice) diff --git a/kinit/klauncher_adaptor.h b/kinit/klauncher_adaptor.h index 0d1d6619..1f7ae99a 100644 --- a/kinit/klauncher_adaptor.h +++ b/kinit/klauncher_adaptor.h @@ -73,7 +73,6 @@ public Q_SLOTS: void autoStart(int phase); // used by plasma-desktop and klauncher itself - void exec_blind(const QString &name, const QStringList &args); void cleanup(); // used by KToolInvocation @@ -103,6 +102,7 @@ private Q_SLOTS: private: QString findExe(const QString &app) const; + void startDetached(const QString &name, const QStringList &args); bool startProgram(const QString &app, const QStringList &args, const QStringList &envs, const quint64 window, const bool temp, const QString &workdir, const qint64 timeout, const KService::Ptr kservice = KService::Ptr(nullptr));