As KFilePreviewGenerator takes care for refreshing the directory lister automatically now, there is no need to reload the directory in Dolphin.

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

4 files changed, 4 insertions, 6 deletions

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 57059e708..575bc7aa2 100644
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -154,9 +154,8 @@ DolphinColumnView::DolphinColumnView(QWidget* parent,
     connect(controller, SIGNAL(nameFilterChanged(const QString&)),
             this, SLOT(setNameFilter(const QString&)));
 
-    updateDecorationSize(dolphinView->showPreview());
-
     m_extensionsFactory = new ViewExtensionsFactory(this, controller);
+    updateDecorationSize(dolphinView->showPreview());
 }
 
 DolphinColumnView::~DolphinColumnView()
diff --git a/src/dolphincolumnviewcontainer.cpp b/src/dolphincolumnviewcontainer.cpp
index ca9cfe0f1..08de897ab 100644
--- a/src/dolphincolumnviewcontainer.cpp
+++ b/src/dolphincolumnviewcontainer.cpp
@@ -362,7 +362,9 @@ void DolphinColumnViewContainer::deleteColumn(DolphinColumnView* column)
         // is destroyed.
         column->setParent(0);
         column->disconnect();
-        emit requestColumnDeletion(column);
+
+        //emit requestColumnDeletion(column);
+        column->deleteLater();
     }
 }
 
diff --git a/src/dolphiniconsview.cpp b/src/dolphiniconsview.cpp
index 10ffd9d42..e06b7b378 100644
--- a/src/dolphiniconsview.cpp
+++ b/src/dolphiniconsview.cpp
@@ -32,7 +32,6 @@
 
 #include <kcategorizedsortfilterproxymodel.h>
 #include <kdialog.h>
-#include <kdirmodel.h>
 #include <kfileitemdelegate.h>
 
 #include <QAbstractProxyModel>
diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index c19b52fbc..a883bad51 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -753,8 +753,6 @@ void DolphinView::setShowPreview(bool show)
     // As the view does not emit a signal when the icon size has been changed,
     // the used zoom level of the controller must be adjusted manually:
     updateZoomLevel(oldZoomLevel);
-
-    loadDirectory(viewPropsUrl);
 }
 
 void DolphinView::setShowHiddenFiles(bool show)