┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2007-12-14 11:45:11 +0000
committerPeter Penz <[email protected]>2007-12-14 11:45:11 +0000
commitc436a142e854b724742acb82a2de111a36b616ce (patch)
treeb6591c1777772f87e736468736a9ac2b6730d66c
parent1e72ef9ca039a133e4694c4aff6e7e89cd482da8 (diff)
Fixed issue that when clicking on Open Office files that Dolphin handles the files as zip-folder. I'm not sure whether there might be a nicer way doing this, but at least for KDE 4.0 this should be sufficient.
BUG: 153981 svn path=/trunk/KDE/kdebase/apps/; revision=748399
-rw-r--r--src/dolphinviewcontainer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 764bc3ca1..64b0d400f 100644
--- 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
+ // TODO: make this configurable for Dolphin in KDE 4.1
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") ||