diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2012-04-24 16:47:55 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2012-04-27 01:38:41 +0200 |
commit | 6a9e1ed2d94202eb1c7b334b1020abad64d8226f (patch) | |
tree | cfaa734fb6921fd312f0a58a0640f4b77e9f99a2 /src/protocolhandler.cpp | |
parent | set Main Window on KDirLister (diff) | |
download | rekonq-6a9e1ed2d94202eb1c7b334b1020abad64d8226f.tar.xz |
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
Diffstat (limited to 'src/protocolhandler.cpp')
-rw-r--r-- | src/protocolhandler.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp index 096aec24..e396ea5e 100644 --- a/src/protocolhandler.cpp +++ b/src/protocolhandler.cpp @@ -176,7 +176,15 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra return true; } - + + // "mailto" handling: It needs to be handled both in preHandling (mail url launched) + // and in postHandling (mail links clicked) + if (_url.protocol() == QL1S("mailto")) + { + KToolInvocation::invokeMailer(_url); + return true; + } + // "apt" handling // NOTE: this is a stupid workaround to ensure apt protocol works if (_url.protocol() == QL1S("apt")) |