From 5f0e4fe5fabd7ca49cb7d6cb54dc6e903fffbf74 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 29 Sep 2010 22:11:37 +0200
Subject: Clean up urlbar use. This fix an urlbar bug opening plugins in next
 tabs and remove some Application::instance() calls from the Web* classes.

---
 src/webpage.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'src/webpage.cpp')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 9be0d3c9..d481567f 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -459,7 +459,12 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 
         mainFrame()->setHtml(html);
         _isOnRekonqPage = true;
-        Application::instance()->mainWindow()->mainView()->urlBar()->setQUrl(replyUrl);
+        
+        WebView *view = qobject_cast<WebView *>(parent());
+        WebTab *tab = qobject_cast<WebTab *>(view->parent());
+        UrlBar *bar = tab->urlBar();
+        bar->setQUrl(replyUrl);
+        
         Application::instance()->mainWindow()->updateActions();
     }
     else
@@ -561,9 +566,14 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
             frame->setHtml(errorPage(reply));
             if(isMainFrameRequest)
             {
-            _isOnRekonqPage = true;
-            Application::instance()->mainWindow()->mainView()->urlBar()->setQUrl(_loadingUrl);
-            Application::instance()->mainWindow()->updateActions();
+                _isOnRekonqPage = true;
+            
+                WebView *view = qobject_cast<WebView *>(parent());
+                WebTab *tab = qobject_cast<WebTab *>(view->parent());
+                UrlBar *bar = tab->urlBar();
+                bar->setQUrl(_loadingUrl);
+
+                Application::instance()->mainWindow()->updateActions();
             }
         }
         break;
-- 
cgit v1.2.1