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

kinit: remove exec_blind method from the D-Bus interface

Browse source 
no longer used by any other program

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-12 14:08:08 +03:00
parent 603c4ba5cf
commit ecef0ed675
2 changed files with 25 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
kinit/klauncher_adaptor.cpp
View file

@ -237,8 +237,7 @@ void KLauncherAdaptor::autoStart(int phase)
continue; continue;
} }
const QString program = programandargs.takeFirst(); const QString program = programandargs.takeFirst();
const QStringList programargs = programandargs; startDetached(program, programandargs);
exec_blind(program, programargs);
} }
switch (phase) { switch (phase) {
case 0: { 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() void KLauncherAdaptor::cleanup()
{ {
kDebug() << "terminating processes" << m_processes.size(); kDebug() << "terminating processes" << m_processes.size();
@ -444,6 +420,29 @@ QString KLauncherAdaptor::findExe(const QString &app) const
return KStandardDirs::findExe(app, environmentpath); 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, bool KLauncherAdaptor::startProgram(const QString &app, const QStringList &args, const QStringList &envs,
const quint64 window, const bool temp, const QString &workdir, const quint64 window, const bool temp, const QString &workdir,
const qint64 timeout, const KService::Ptr kservice) const qint64 timeout, const KService::Ptr kservice)

2
kinit/klauncher_adaptor.h
View file

@ -73,7 +73,6 @@ public Q_SLOTS:
void autoStart(int phase); void autoStart(int phase);
// used by plasma-desktop and klauncher itself // used by plasma-desktop and klauncher itself
void exec_blind(const QString &name, const QStringList &args);
void cleanup(); void cleanup();
// used by KToolInvocation // used by KToolInvocation
@ -103,6 +102,7 @@ private Q_SLOTS:
private: private:
QString findExe(const QString &app) const; 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, bool startProgram(const QString &app, const QStringList &args, const QStringList &envs,
const quint64 window, const bool temp, const QString &workdir, const quint64 window, const bool temp, const QString &workdir,
const qint64 timeout, const KService::Ptr kservice = KService::Ptr(nullptr)); const qint64 timeout, const KService::Ptr kservice = KService::Ptr(nullptr));