From 6a9e1ed2d94202eb1c7b334b1020abad64d8226f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 24 Apr 2012 16:47:55 +0200
Subject: Clean up url management

- Let ftp url(s) work again
- Do NOT check url twice via KUriFilter (removed MainWindow::filterUrl)
- ensure we are lowering just http url hosts
- mailto via urlbar handling

CCBUG: 298114
CCBUG: 284829

Conflicts:

	src/mainwindow.cpp

Backporting from master with the needed fixes
---
 src/webpage.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/webpage.cpp')

diff --git a/src/webpage.cpp b/src/webpage.cpp
index f22d478b..86261e36 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -500,6 +500,10 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply)
         break;
 
     case QNetworkReply::UnknownNetworkError:                 // unknown network-related error detected
+        // last chance for the strange things (eg: FTP, custom schemes, etc...)
+        if (_protHandler.postHandling(reply->request(), mainFrame()))
+            return;
+        
     case QNetworkReply::ConnectionRefusedError:              // remote server refused connection
     case QNetworkReply::HostNotFoundError:                   // invalid hostname
     case QNetworkReply::TimeoutError:                        // connection time out
-- 
cgit v1.2.1