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

kdecore: cleanup Desktop file handler

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2016-02-20 16:39:26 +02:00
parent fea84d5570
commit 8cd418cd6a
1 changed files with 4 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
kdecore/config/kdesktopfile.cpp
View file

@ -255,40 +255,14 @@ bool KDesktopFile::tryExec() const
QString te = d->desktopGroup.readEntry("TryExec", QString()); QString te = d->desktopGroup.readEntry("TryExec", QString());
if (!te.isEmpty()) { if (!te.isEmpty()) {
if (!QDir::isRelativePath(te)) { if(KGlobal::dirs()->findExe(te).isEmpty()) {
if (KDE::access(te, X_OK))
return false;
} else {
// !!! Sergey A. Sukiyazov <corwin@micom.don.ru> !!!
// Environment PATH may contain filenames in 8bit locale specified
// encoding (Like a filenames).
const QStringList dirs = QFile::decodeName(qgetenv("PATH"))
.split(QLatin1Char(KPATH_SEPARATOR), QString::SkipEmptyParts);
QStringList::ConstIterator it(dirs.begin());
bool match = false;
for (; it != dirs.end(); ++it) {
QString fName = *it + QLatin1Char(KDIR_SEPARATOR) + te;
if (KDE::access(fName, X_OK) == 0)
{
match = true;
break;
}
}
// didn't match at all
if (!match)
return false; return false;
} }
} }
const QStringList list = d->desktopGroup.readEntry("X-KDE-AuthorizeAction", QStringList()); const QStringList list = d->desktopGroup.readEntry("X-KDE-AuthorizeAction", QStringList());
if (!list.isEmpty()) foreach (const QString it, list) {
{ if (!KAuthorized::authorize(it.trimmed()))
for(QStringList::ConstIterator it = list.begin(); return false;
it != list.end();
++it)
{
if (!KAuthorized::authorize((*it).trimmed()))
return false;
}
} }
// See also KService::username() // See also KService::username()