summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-10-16 19:27:25 +0200
committerAndrea Diamantini <adjam7@gmail.com>2010-10-16 19:27:25 +0200
commitdc1dcc4d59ad61b46365696db2ee0518574127bf (patch)
tree028d00323b1249a9f63cffe508685569b6e76f0d
parentMore i18n fixes, as instructed by Panagiotis Papadopoulos (diff)
downloadrekonq-dc1dcc4d59ad61b46365696db2ee0518574127bf.tar.xz
Fixed i18n string, ftp handling back to rekonq
-rw-r--r--src/protocolhandler.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/protocolhandler.cpp b/src/protocolhandler.cpp
index 41e4f6d8..23743acf 100644
--- a/src/protocolhandler.cpp
+++ b/src/protocolhandler.cpp
@@ -76,10 +76,14 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
_url = request.url();
_frame = frame;
- // rekonq can handle http/s and file browsing easily
+ // rekonq can handle http/s browsing easily
if (_url.protocol() == QL1S("http") || _url.protocol() == QL1S("https") || _url.protocol() == QL1S("file"))
return false;
+ // rekonq can handle file & ftp schemes, if you like,,
+ if (_url.protocol() == QL1S("ftp") || _url.protocol() == QL1S("file"))
+ return false;
+
// relative urls
if (_url.isRelative())
return false;
@@ -106,6 +110,9 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
return true;
}
+ // NOTE
+ // handle here "custom" rekonq protocols
+
// "abp" handling
if (_url.protocol() == QL1S("abp"))
{
@@ -161,8 +168,8 @@ bool ProtocolHandler::preHandling(const QNetworkRequest &request, QWebFrame *fra
{
//Error Message, for those protocols even KDE cant handle
KMessageBox::error( Application::instance()->mainWindow(), i18nc("@info",
- "rekonq can not handle this URL.
- Please use an appropriate application to open it."));
+ "rekonq can not handle this URL. \
+ Please use an appropriate application to open it."));
return false;
}