mirror of
https://bitbucket.org/smil3y/kdelibs.git
synced 2025-02-24 02:42:48 +00:00
kinit: check if ASN is disabled for service via KRun::checkStartupNotify()
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
e1db604f6b
commit
a320630b94
1 changed files with 13 additions and 7 deletions
|
@ -276,13 +276,19 @@ int KLauncherAdaptor::start_service_by_desktop_path(const QString &serviceName,
|
|||
const QString program = programandargs.takeFirst();
|
||||
const QStringList programargs = programandargs;
|
||||
Q_ASSERT(m_kstartupinfoid.none() == true);
|
||||
m_kstartupinfoid = KStartupInfoId();
|
||||
m_kstartupinfodata = KStartupInfoData();
|
||||
m_kstartupinfoid.initId(startup_id.toLatin1());
|
||||
m_kstartupinfodata.setBin(QFileInfo(program).fileName());
|
||||
m_kstartupinfodata.setIcon(kservice->icon());
|
||||
m_kstartupinfodata.setDescription(i18n("Launching %1", kservice->name()));
|
||||
sendSIStart();
|
||||
bool startupsilent = false;
|
||||
QByteArray startupwmclass;
|
||||
if (KRun::checkStartupNotify(kservice.data(), &startupsilent, &startupwmclass)) {
|
||||
m_kstartupinfoid = KStartupInfoId();
|
||||
m_kstartupinfodata = KStartupInfoData();
|
||||
m_kstartupinfoid.initId(startup_id.toLatin1());
|
||||
m_kstartupinfodata.setBin(QFileInfo(program).fileName());
|
||||
m_kstartupinfodata.setIcon(kservice->icon());
|
||||
m_kstartupinfodata.setDescription(i18n("Launching %1", kservice->name()));
|
||||
m_kstartupinfodata.setSilent(startupsilent ? KStartupInfoData::Yes : KStartupInfoData::No);
|
||||
m_kstartupinfodata.setWMClass(startupwmclass);
|
||||
sendSIStart();
|
||||
}
|
||||
int result = kdeinit_exec(program, programargs, envs, QString(), msg, dbusServiceName, error, pid);
|
||||
if (result != KLauncherAdaptor::NoError) {
|
||||
// sendSIFinish() is called on exec error
|
||||
|
|
Loading…
Add table
Reference in a new issue