simplified code for assuring that Open Office files won't get browsed + added comment...

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

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 64b0d400f6308481a8a715e57b02cbef45e2b539..4d03501c1901c5474b54b1fc62005491f565b268 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -402,8 +402,12 @@ void DolphinViewContainer::slotItemTriggered(const KFileItem& item)
     } else if (item.isFile()) {
         // allow to browse through ZIP and tar files
         // TODO: make this configurable for Dolphin in KDE 4.1
     } 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") && mime->patterns().contains("*.zip")) {
+
+        // Don't use mime->is("application/zip"), as this would
+        // also browse through Open Office files:
+        if (mime->name() == "application/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") ||