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: do not use the program arguments to check for remote URLs

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-05-13 08:04:39 +03:00
parent cfceb37f62
commit c8304a4da7
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kinit/klauncher_adaptor.cpp
View file

@ -335,9 +335,9 @@ bool KLauncherAdaptor::start_service_by_storage_id(const QString &serviceName,
const QString kserviceexec = kservice->exec(); const QString kserviceexec = kservice->exec();
if (!kserviceexec.contains(QLatin1String("%u")) && !kserviceexec.contains(QLatin1String("%U"))) { if (!kserviceexec.contains(QLatin1String("%u")) && !kserviceexec.contains(QLatin1String("%U"))) {
kDebug() << "service does not support remote" << serviceName; kDebug() << "service does not support remote" << serviceName;
// TODO: upload? spec says nothing
QStringList downloaded; QStringList downloaded;
for (int i = 0; i < programandargs.size(); i++) { foreach (const QString &url, urls) {
const QString url = programandargs.at(i);
const KUrl realurl = KUrl(url); const KUrl realurl = KUrl(url);
if (!realurl.isLocalFile()) { if (!realurl.isLocalFile()) {
// remote URLs should not be passed along with temporary files // remote URLs should not be passed along with temporary files
@ -354,7 +354,12 @@ bool KLauncherAdaptor::start_service_by_storage_id(const QString &serviceName,
} }
kDebug() << "downloaded" << prettyurl << "to" << urldestination; kDebug() << "downloaded" << prettyurl << "to" << urldestination;
downloaded.append(urldestination); downloaded.append(urldestination);
programandargs[i] = urldestination; // URLs may not be unique
int indexofurl = programandargs.indexOf(url);
while (indexofurl != -1) {
programandargs.replace(indexofurl, urldestination);
indexofurl = programandargs.indexOf(url);
}
} }
} }
temp = (temp || !downloaded.isEmpty()); temp = (temp || !downloaded.isEmpty());