add KCM for the services settings, so that they are also accessible in Konqueror

[dolphin.git] / src / dolphincolumnview.cpp

diff --git a/src/dolphincolumnview.cpp b/src/dolphincolumnview.cpp
index 05c33d7dd1339b3c8d02ed83b02491901a20a84f..4d180442b750da734adac1ee3f6ad3400239ec16 100644 (file)
--- a/src/dolphincolumnview.cpp
+++ b/src/dolphincolumnview.cpp
@@ -21,11 +21,13 @@
 
 #include "dolphincolumnwidget.h"
 #include "dolphincontroller.h"
-#include "dolphinsettings.h"
+#include "settings/dolphinsettings.h"
 #include "zoomlevelinfo.h"
 
 #include "dolphin_columnmodesettings.h"
 
+#include <kfilepreviewgenerator.h>
+
 #include <QPoint>
 #include <QScrollBar>
 #include <QTimeLine>
@@ -594,8 +596,16 @@ void DolphinColumnView::deleteColumn(DolphinColumnWidget* column)
         if (m_controller->itemView() == column) {
             m_controller->setItemView(0);
         }
+        // deleteWhenNotDragSource(column) does not necessarily delete column,
+        // and we want its preview generator destroyed immediately.
+        column->m_previewGenerator->deleteLater();
+        column->m_previewGenerator = 0;
+        column->hide();
+        // Prevent automatic destruction of column when this DolphinColumnView
+        // is destroyed.
+        column->setParent(0);
         column->disconnect();
-        column->deleteLater();
+        emit requestColumnDeletion(column);
     }
 }