diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-04-30 01:26:39 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-04-30 01:26:39 +0200 |
| commit | 97cd6ce8851e19ddce3d0bf098a8b8a00ee02992 (patch) | |
| tree | 3f250058b6792ca4fc275d8d8e6a2d8e282c4f8a /src/webpage.cpp | |
| parent | Fixed wrong pointed out text in the Browse ListItem (diff) | |
| download | rekonq-97cd6ce8851e19ddce3d0bf098a8b8a00ee02992.tar.xz | |
Fix (again and again) ftp handling (and errors in general)
Disabled the "Failed to Load" string as rekonq usually does a lot more than
WebKit to "load" an url..
Diffstat (limited to 'src/webpage.cpp')
| -rw-r--r-- | src/webpage.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index efec20cf..1c9910e2 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -237,6 +237,11 @@ WebPage *WebPage::createWindow(QWebPage::WebWindowType type) void WebPage::handleUnsupportedContent(QNetworkReply *reply) { + // NOTE + // This is probably needed just in ONE stupid case.. + if( _protHandler.postHandling(reply->request(), mainFrame()) ) + return; + if (reply->error() == QNetworkReply::NoError) { const KUrl url( reply->url() ); @@ -358,14 +363,14 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply) } break; - case QNetworkReply::UnknownNetworkError: // unknown network-related error detected - if( _protHandler.postHandling(reply->request(), mainFrame()) ) - break; - case QNetworkReply::ContentAccessDenied: // access to remote content denied (similar to HTTP error 401) kDebug() << "We (hopefully) are managing this through the adblock :)"; break; - + + case QNetworkReply::UnknownNetworkError: // unknown network-related error detected + if( _protHandler.postHandling(reply->request(), mainFrame()) ) + break; + case QNetworkReply::ConnectionRefusedError: // remote server refused connection case QNetworkReply::HostNotFoundError: // invalid hostname case QNetworkReply::TimeoutError: // connection time out |