X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/54dfdc930a5511eae2b15f3e87e5d1cd425bdbe4..f55fe7bce6cabcd92fbd195fa549248a8c899e7b:/src/dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 99c76bee2..4d03501c1 100644
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -158,6 +158,10 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
 
 DolphinViewContainer::~DolphinViewContainer()
 {
+    m_dirLister->disconnect();
+
+    delete m_proxyModel;
+    m_proxyModel = 0;
     delete m_dolphinModel;
     m_dolphinModel = 0;
     m_dirLister = 0; // deleted by m_dolphinModel
@@ -397,8 +401,13 @@ 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")) {
+
+        // 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") ||