diff options
| author | David Edmundson <david@davidedmundson.co.uk> | 2016-05-18 01:47:51 +0100 |
|---|---|---|
| committer | David Edmundson <kde@davidedmundson.co.uk> | 2016-05-19 22:19:01 +0100 |
| commit | b1c64c165eb7e498f6cfed65e2d439d86f21a116 (patch) | |
| tree | 4c180a2e2b0fe5f27c829c63ccd53e7e198afcfb | |
| parent | 4015794d1275833758198d5705bbdf811c7ed89d (diff) | |
| download | kconfig-b1c64c165eb7e498f6cfed65e2d439d86f21a116.tar.gz kconfig-b1c64c165eb7e498f6cfed65e2d439d86f21a116.tar.bz2 | |
Avoid skipping KAuthorized check
Previously, if a .desktop file had a TryExec and a X-KDE-AuthorizeAction
entry we would skip the KAuthorized check. This is clearly wrong.
REVIEW: 127948
| -rw-r--r-- | src/core/kdesktopfile.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp index eda7c292..4a550302 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp @@ -281,9 +281,12 @@ bool KDesktopFile::tryExec() const QString te = d->desktopGroup.readEntry("TryExec", QString()); if (!te.isEmpty()) { - return !QStandardPaths::findExecutable(te).isEmpty(); + if (QStandardPaths::findExecutable(te).isEmpty()) { + return false; + } } const QStringList list = d->desktopGroup.readEntry("X-KDE-AuthorizeAction", QStringList()); + if (!list.isEmpty()) { for (QStringList::ConstIterator it = list.begin(); it != list.end(); |