Essential validity check that fell through the cracks when setSelectionRecursive...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 89ed54aca167005c23abd87ea2604384c3135d90..ad79d6bb1132aa4083ba82394506827d2bee3b54 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -46,7 +46,6 @@
 #include "dolphinmodel.h"
 #include "dolphincolumnview.h"
 #include "dolphincontroller.h"
-#include "dolphindropcontroller.h"
 #include "dolphinstatusbar.h"
 #include "dolphinmainwindow.h"
 #include "dolphindirlister.h"
@@ -54,6 +53,7 @@
 #include "dolphindetailsview.h"
 #include "dolphiniconsview.h"
 #include "dolphincontextmenu.h"
+#include "draganddrophelper.h"
 #include "filterbar.h"
 #include "kurlnavigator.h"
 #include "viewproperties.h"
@@ -140,6 +140,8 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
             this, SLOT(slotItemTriggered(KFileItem)));
     connect(m_view, SIGNAL(startedPathLoading(const KUrl&)),
             this, SLOT(saveRootUrl(const KUrl&)));
+    connect(m_view, SIGNAL(redirection(KUrl, KUrl)),
+            this, SLOT(redirect(KUrl, KUrl)));
 
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));
@@ -350,12 +352,12 @@ void DolphinViewContainer::activate()
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {
-    if (url.protocol().isEmpty()) {
+    if (KProtocolManager::supportsListing(url)) {
+        m_view->updateView(url, m_urlNavigator->savedRootUrl());
+    } else {
         // The URL navigator only checks for validity, not
         // if the URL can be listed. 
-        showErrorMessage(i18nc("@info:status", "Protocol not supported"));
-    } else {
-        m_view->updateView(url, m_urlNavigator->savedRootUrl());
+        showErrorMessage(i18nc("@info:status", "Protocol not supported"));        
     }
 }
 
@@ -367,7 +369,16 @@ void DolphinViewContainer::saveRootUrl(const KUrl& url)
 
 void DolphinViewContainer::dropUrls(const KUrl& destination, QDropEvent* event)
 {
-    DolphinDropController::dropUrls(KFileItem(), destination, event, this);
+    DragAndDropHelper::dropUrls(KFileItem(), destination, event, this);
+}
+
+void DolphinViewContainer::redirect(const KUrl& oldUrl, const KUrl& newUrl)
+{
+    Q_UNUSED(oldUrl);
+    const bool block = m_urlNavigator->signalsBlocked();
+    m_urlNavigator->blockSignals(true);
+    m_urlNavigator->setUrl(newUrl);
+    m_urlNavigator->blockSignals(block);
 }
 
 void DolphinViewContainer::slotItemTriggered(const KFileItem& item)