From 42e6065c5519a0cc78e9d66345d6786d5ad15874 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 6 Sep 2009 11:04:03 +0200
Subject: Fixing rekonq Multi Windows behaviour and Added options about tabbed
 (or not) browsing..

---
 src/webpage.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/webpage.cpp')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index 7ef9ec1d..ede503a5 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -126,9 +126,15 @@ WebPage *WebPage::newWindow(WebWindowType type)
         kDebug() << "Modal Dialog ---------------------------------------";
     }
 
-    // FIXME: regression introduced. No more following rekonq setting about tab focus
-    // the FIX should be moving loadUrl code from Application to acceptNavigationRequest
-    WebView *w = Application::instance()->mainWindow()->mainView()->newWebView(!ReKonfig::openTabsBack());
+    WebView *w = 0;
+    if(ReKonfig::openTabNoWindow())
+    {
+        w = Application::instance()->mainWindow()->mainView()->newWebView(!ReKonfig::openTabsBack());
+    }
+    else
+    {
+        w = Application::instance()->newMainWindow()->mainView()->currentWebView();
+    }
     return w->page();
 }
 
-- 
cgit v1.2.1