From b334cc03d5bc07b7ee6b482e2b0ff13a76a48d72 Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Sun, 6 Dec 2015 16:00:18 +0100 Subject: Fix mimetype detection using magic library for mime types not contained in TDE settings This resolves Bug 2392 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit b0ac7d287922e883a2e571222089b680adfe46c6) --- kio/kio/kmimetype.cpp | 8 ++++++-- mimetypes/application/octet-stream.desktop | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/kio/kio/kmimetype.cpp b/kio/kio/kmimetype.cpp index c3fc91087..f63903c27 100644 --- a/kio/kio/kmimetype.cpp +++ b/kio/kio/kmimetype.cpp @@ -221,8 +221,12 @@ KMimeType::Ptr KMimeType::findByURL( const KURL& _url, mode_t _mode, KMimeMagicResult* result = KMimeMagic::self()->findFileType( path ); - if ( result && result->isValid() && result->accuracy() > 0 ) - return mimeType( result->mimeType() ); + if ( result && result->isValid() && result->accuracy() > 0 ) { + KMimeType::Ptr resultMime = mimeType( result->mimeType() ); + if (resultMime->patternsAccuracy() > 0) { + return resultMime; + } + } } } diff --git a/mimetypes/application/octet-stream.desktop b/mimetypes/application/octet-stream.desktop index 3b2859890..0af521098 100644 --- a/mimetypes/application/octet-stream.desktop +++ b/mimetypes/application/octet-stream.desktop @@ -1,6 +1,7 @@ [Desktop Entry] Type=MimeType MimeType=application/octet-stream +X-KDE-PatternsAccuracy=0 Comment=Unknown Comment[af]=Onbekende Comment[ar]=غير معروف -- cgit v1.2.3