From 3e463e4dccf07fd252411ec7e9c8710f9d46974b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 7 Aug 2009 16:04:46 +0200
Subject: Load url in the background urlbar fixes

---
 src/application.cpp | 3 +--
 src/mainview.cpp    | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index 98b8d870..53393b7b 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -320,11 +320,10 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
         break;
     case Rekonq::CurrentTab:
         webView = m_mainWindow->mainView()->currentWebView();
+        m_mainWindow->mainView()->currentUrlBar()->setUrl(loadingUrl.prettyUrl());
         break;
     };
 
-    m_mainWindow->mainView()->currentUrlBar()->setUrl(loadingUrl.prettyUrl());
-
     if (webView)
     {
         webView->setFocus();
diff --git a/src/mainview.cpp b/src/mainview.cpp
index f1026d84..5b08e17a 100644
--- a/src/mainview.cpp
+++ b/src/mainview.cpp
@@ -324,6 +324,7 @@ void MainView::slotCurrentChanged(int index)
 
     emit setCurrentTitle(webView->title());
     m_urlBars->setCurrentIndex(index);
+    currentUrlBar()->setUrl(webView->url());
     emit showStatusBarMessage(webView->lastStatusBarText());
 
     // set focus to the current webview
-- 
cgit v1.2.1