diff options
Diffstat (limited to 'src/webpage.cpp')
| -rw-r--r-- | src/webpage.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index 33711f7d..d3e49e10 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -65,7 +65,7 @@ #include <QtGui/QClipboard> #include <QtGui/QKeyEvent> -#include <QUiLoader> +#include <QtUiTools/QUiLoader> WebPage::WebPage(QObject *parent) @@ -91,13 +91,13 @@ WebPage::~WebPage() bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) { + m_requestedUrl = request.url(); + if (m_requestedUrl.scheme() == QLatin1String("mailto")) { KToolInvocation::invokeMailer(m_requestedUrl); return false; } - - m_requestedUrl = request.url(); if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton) { @@ -127,7 +127,9 @@ WebPage *WebPage::newWindow(WebWindowType type) kDebug() << "Modal Dialog ---------------------------------------"; } - WebView *w = Application::instance()->mainWindow()->mainView()->newTab(!ReKonfig::openTabsBack()); + // 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()); return w->page(); } |