┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2007-12-15 15:20:45 +0000
committerPeter Penz <[email protected]>2007-12-15 15:20:45 +0000
commite91a20c9b8faabde14a04f2d30c7a9229a33adc6 (patch)
treebf0f342a22a589d70f86018036b2fe282293c5b4
parent86078850a4ead111f81e0e6df77991b80a686d93 (diff)
simplified code for assuring that Open Office files won't get browsed + added comment (thanks to David for the hint)
svn path=/trunk/KDE/kdebase/apps/; revision=748799
-rw-r--r--src/dolphinviewcontainer.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 64b0d400f..4d03501c1 100644
--- 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
+
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") ||