From 862ceee323ad3b474ce9de11eefbddd99c528fac Mon Sep 17 00:00:00 2001
From: Peter Penz <peter.penz19@gmail.com>
Date: Wed, 13 Jun 2007 17:08:39 +0000
Subject: fixed some activation issues in combination with split views

svn path=/trunk/KDE/kdebase/apps/; revision=674980
---
 src/dolphinmainwindow.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/dolphinmainwindow.cpp')

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index bb4ff90b7..35c50e88d 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -221,8 +221,9 @@ void DolphinMainWindow::dropUrls(const KUrl::List& urls,
 
 void DolphinMainWindow::changeUrl(const KUrl& url)
 {
-    if (activeViewContainer() != 0) {
-        activeViewContainer()->setUrl(url);
+    DolphinViewContainer* view = activeViewContainer();
+    if (view != 0) {
+        view->setUrl(url);
         updateEditActions();
         updateViewActions();
         updateGoActions();
@@ -1026,9 +1027,11 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* view)
     updateViewActions();
     updateGoActions();
 
-    setCaption(m_activeViewContainer->url().fileName());
+    const KUrl& url = m_activeViewContainer->url();
+    setCaption(url.fileName());
 
     emit activeViewChanged();
+    emit urlChanged(url);
 }
 
 void DolphinMainWindow::setupActions()
-- 
cgit v1.3