diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2009-11-11 11:19:22 +0100 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2009-11-11 11:19:22 +0100 |
commit | 7a106ed1b4af53a04467cfdaa4c79d5946a3b999 (patch) | |
tree | 12cda5f4ce235bd2671e4d6dc578724dd87e2827 | |
parent | Show clear button in history panel filter line edit (diff) | |
download | rekonq-7a106ed1b4af53a04467cfdaa4c79d5946a3b999.tar.xz |
Fixing about: protocol loading.
And removing MouseMoveEvent check.
I have to point out that this fix works just with Qt 4.5
-rw-r--r-- | src/webpage.cpp | 10 | ||||
-rw-r--r-- | src/webview.cpp | 6 |
2 files changed, 4 insertions, 12 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index 51722986..3400564e 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -114,9 +114,10 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r return false; } - if (request.url().scheme() == QLatin1String("rekonq")) + if (request.url().scheme() == QLatin1String("about")) { - Application::instance()->loadUrl( request.url() ); + kDebug() << "loading " << request.url(); + Application::instance()->mainWindow()->newTabPage( request.url() ); return false; } @@ -129,7 +130,6 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r WebPage *WebPage::createWindow(QWebPage::WebWindowType type) { kDebug() << "WebPage createWindow slot"; - return newWindow(type); } @@ -138,9 +138,7 @@ WebPage *WebPage::newWindow(WebWindowType type) { // added to manage web modal dialogs if (type == QWebPage::WebModalDialog) - { - kDebug() << "Modal Dialog ---------------------------------------"; - } + kDebug() << "Modal Dialog"; WebView *w = 0; if(ReKonfig::openTabNoWindow()) diff --git a/src/webview.cpp b/src/webview.cpp index 9b439ba3..1dd5ad6a 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -368,12 +368,6 @@ void WebView::mousePressEvent(QMouseEvent *event) void WebView::mouseMoveEvent(QMouseEvent *event) { m_mousePos = event->pos(); - - // fix crashes on loading homepage links when no internet - // connection (so, failed loading) - if(url().protocol() == QLatin1String("rekonq")) - return; - QWebView::mouseMoveEvent(event); } |