Don't request any meta data, if the requested URL is equal to the currently shown...

[dolphin.git] / src / dolphinviewcontainer.cpp

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 5ec6522e770160a12d67c168112edde565c060e1..bed7d275848eee531f92b4813f5fe3be0bc3cb67 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -144,9 +144,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow,
     connect(m_urlNavigator, SIGNAL(urlChanged(const KUrl&)),
             this, SLOT(restoreView(const KUrl&)));
 
-    m_statusBar = new DolphinStatusBar(this, url);
-    connect(m_view, SIGNAL(urlChanged(const KUrl&)),
-            m_statusBar, SLOT(updateSpaceInfoContent(const KUrl&)));
+    m_statusBar = new DolphinStatusBar(this, m_view);
 
     m_filterBar = new FilterBar(this);
     m_filterBar->setVisible(settings->filterBar());
@@ -199,6 +197,12 @@ bool DolphinViewContainer::isActive() const
     return m_view->isActive();
 }
 
+void DolphinViewContainer::refresh()
+{
+    m_view->refresh();
+    m_statusBar->refresh();
+}
+
 bool DolphinViewContainer::isFilterBarVisible() const
 {
     return m_filterBar->isVisible();
@@ -346,7 +350,13 @@ void DolphinViewContainer::activate()
 
 void DolphinViewContainer::restoreView(const KUrl& url)
 {
-    m_view->updateView(url, m_urlNavigator->savedRootUrl());
+    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"));        
+    }
 }
 
 void DolphinViewContainer::saveRootUrl(const KUrl& url)