summaryrefslogtreecommitdiffstats
path: root/tdeio
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-04-11 14:59:49 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-04-11 14:59:49 +0200
commita5def4f9a471a83465be8918a443fe96e49e3029 (patch)
tree3349f71ff3da6a05e11865c55fa3bf8c45516ded /tdeio
parent0b1a3e154b35c26c96bb523a956a5bf8b3c5e91c (diff)
downloadtdelibs-a5def4f9a471a83465be8918a443fe96e49e3029.tar.gz
tdelibs-a5def4f9a471a83465be8918a443fe96e49e3029.zip
Add a definition of MIME type application/x-pie-executable.
This resolves incorrect identification of binary executables with libmagick >= 5.33. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'tdeio')
-rw-r--r--tdeio/tdeio/krun.cpp5
-rw-r--r--tdeio/tdeio/tdefileitem.cpp2
2 files changed, 5 insertions, 2 deletions
diff --git a/tdeio/tdeio/krun.cpp b/tdeio/tdeio/krun.cpp
index 329199da9..402b339b0 100644
--- a/tdeio/tdeio/krun.cpp
+++ b/tdeio/tdeio/krun.cpp
@@ -155,8 +155,10 @@ pid_t KRun::runURL( const KURL& u, const TQString& _mimetype, TQWidget* window,
noAuth = true;
}
}
- else if (_mimetype == "application/x-executable")
+ else if (_mimetype == "application/x-executable" || _mimetype == "application/x-pie-executable")
+ {
noRun = true;
+ }
}
else if ( isExecutable(_mimetype) )
{
@@ -1452,6 +1454,7 @@ bool KRun::isExecutable( const TQString& serviceType )
serviceType == "media/builtin-trash" ||
serviceType == "media/builtin-webbrowser" ||
serviceType == "application/x-executable" ||
+ serviceType == "application/x-pie-executable" ||
serviceType == "application/x-msdos-program" ||
serviceType == "application/x-shellscript" );
}
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 7af8aae39..577a8a0d7 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -700,7 +700,7 @@ TQPixmap KFileItem::pixmap( int _size, int _state ) const
if (p.isNull())
kdWarning() << "Pixmap not found for mimetype " << m_pMimeType->name() << endl;
- if ( mime->name() == "application/x-executable" ) {
+ if ( mime->name() == "application/x-executable" || mime->name() == "application/x-pie-executable" ) {
// At first glance it might seem to be a good idea to
// look for .desktop files for this executable before resorting to the embedded icon
// in the same fashion as the minicli, but on close examination this is NOT A GOOD IDEA.