summaryrefslogtreecommitdiff
path: root/src/webpage.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-09-06 11:04:03 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-09-06 11:04:03 +0200
commit42e6065c5519a0cc78e9d66345d6786d5ad15874 (patch)
treeb412a328f341c93bd07ccfc833b9befb5838e0af /src/webpage.cpp
parentSimplified CookieJar management (diff)
downloadrekonq-42e6065c5519a0cc78e9d66345d6786d5ad15874.tar.xz
Fixing rekonq Multi Windows behaviour and
Added options about tabbed (or not) browsing..
Diffstat (limited to 'src/webpage.cpp')
-rw-r--r--src/webpage.cpp12
1 files changed, 9 insertions, 3 deletions
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();
}