Fixed issue that when clicking on Open Office files that Dolphin handles the files...

BUG: 153981

svn path=/trunk/KDE/kdebase/apps/; revision=748399

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 764bc3ca1833f8c96bd8e1d11207e254338210aa..64b0d400f6308481a8a715e57b02cbef45e2b539 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -401,8 +401,9 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
         m_view->setUrl(url);
     } else if (item.isFile()) {
         // allow to browse through ZIP and tar files
         m_view->setUrl(url);
     } else if (item.isFile()) {
         // allow to browse through ZIP and tar files

+        // TODO: make this configurable for Dolphin in KDE 4.1

         KMimeType::Ptr mime = item.mimeTypePtr();
         KMimeType::Ptr mime = item.mimeTypePtr();

-        if (mime->is("application/zip")) {
+        if (mime->is("application/zip") && mime->patterns().contains("*.zip")) {

             url.setProtocol("zip");
             m_view->setUrl(url);
         } else if (mime->is("application/x-tar") ||
             url.setProtocol("zip");
             m_view->setUrl(url);
         } else if (mime->is("application/x-tar") ||