Treeview fixes (backport):

* don't jump to the selected folder when expanding a sub tree within the treeview widget
* don't reset the root of non-local URLs when there is no Places-URL available

BUG: 155996
BUG: 156008

svn path=/branches/KDE/4.0/kdebase/apps/; revision=762706

1 files changed, 8 insertions, 0 deletions

diff --git a/src/treeviewsidebarpage.h b/src/treeviewsidebarpage.h
index 978323f40..d0c3850e9 100644
--- a/src/treeviewsidebarpage.h
+++ b/src/treeviewsidebarpage.h
@@ -107,7 +107,15 @@ private:
      */
     void loadTree(const KUrl& url);
 
+    /**
+     * Selects the current leaf directory m_leafDir and assures
+     * that the directory is visible if the leaf has been set by
+     * TreeViewSidebarPage::setUrl().
+     */
+    void selectLeafDirectory();
+
 private:
+    bool m_setLeafVisible;
     bool m_dirListerCompleted;
     KDirLister* m_dirLister;
     DolphinModel* m_dolphinModel;