From c04747a9490d39e97c7800a8b19fda40654970f3 Mon Sep 17 00:00:00 2001 From: Lionel Chauvin Date: Mon, 10 Aug 2009 23:31:11 +0200 Subject: prevent icon loading when error page --- src/webpage.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/webpage.cpp') diff --git a/src/webpage.cpp b/src/webpage.cpp index 6dd3286c..c91b9471 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -72,6 +72,7 @@ WebPage::WebPage(QObject *parent) : QWebPage(parent) , m_keyboardModifiers(Qt::NoModifier) , m_pressedButtons(Qt::NoButton) + , m_requestedUrl("") { setForwardUnsupportedContent(true); @@ -85,6 +86,8 @@ WebPage::WebPage(QObject *parent) bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type) { + m_requestedUrl = request.url(); + if (m_keyboardModifiers & Qt::ControlModifier || m_pressedButtons == Qt::MidButton) { Application::instance()->loadUrl(request.url(), Rekonq::SettingOpenTab); @@ -155,6 +158,9 @@ void WebPage::slotHandleUnsupportedContent(QNetworkReply *reply) void WebPage::manageNetworkErrors(QNetworkReply* reply) { + if (reply->url() != m_requestedUrl) //prevent favicon loading + return; + switch (reply->error()) { case QNetworkReply::NoError: -- cgit v1.2.1