Forward port of SVN commit 1096089: Fix regression that columns stay empty when switching between URLs that differ by more than one sub directory. Thanks to Frank Reininghaus for the analysis.

CCBUG: 227785
CCBUG: 227748

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

1 files changed, 0 insertions, 13 deletions

diff --git a/src/dolphinview.cpp b/src/dolphinview.cpp
index 2fa351b32..c5f6c91d3 100644
--- a/src/dolphinview.cpp
+++ b/src/dolphinview.cpp
@@ -1211,14 +1211,6 @@ void DolphinView::loadDirectory(const KUrl& url, bool reload)
 
     KDirLister* dirLister = m_viewAccessor.dirLister();
     dirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
-
-    KDirLister* rootDirLister = m_viewAccessor.rootDirLister();
-    if (dirLister != rootDirLister) {
-        // In the case of the column view the root directory lister can be different. Assure
-        // that it gets synchronized (clients from DolphinView are not aware that internally
-        // different directory listers are used).
-        rootDirLister->openUrl(url, reload ? KDirLister::Reload : KDirLister::NoFlags);
-    }
 }
 
 void DolphinView::applyViewProperties()
@@ -1507,11 +1499,6 @@ KUrl DolphinView::ViewAccessor::rootUrl() const
     return (m_columnsContainer != 0) ? m_columnsContainer->rootUrl() : KUrl();
 }
 
-KDirLister* DolphinView::ViewAccessor::rootDirLister() const
-{
-    return static_cast<DolphinModel*>(m_proxyModel->sourceModel())->dirLister();
-}
-
 bool DolphinView::ViewAccessor::supportsCategorizedSorting() const
 {
     return m_iconsView != 0;