Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Fixed showing option what to do with some urls with external protocol.

Browse Source 
- sometimes, just "?" was shown in dialog instead of actual external url
This commit is contained in:
nowrep 2012-06-27 20:32:13 +02:00
parent da7fd9ebba
commit fa72a38050
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/webview/webpage.cpp
View File

@ -628,10 +628,12 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
case QNetworkReply::UnknownNetworkError: case QNetworkReply::UnknownNetworkError:
errorString = exOption->errorString.isEmpty() ? tr("Unknown network error") : exOption->errorString; errorString = exOption->errorString.isEmpty() ? tr("Unknown network error") : exOption->errorString;
break; break;
case QNetworkReply::ProtocolUnknownError: case QNetworkReply::ProtocolUnknownError: {
handleUnknownProtocol(exOption->url); // Sometimes exOption->url returns just "?" instead of actual url
const QUrl unknownProtocolUrl = (exOption->url == QUrl("?")) ? erPage->mainFrame()->requestedUrl() : exOption->url;
handleUnknownProtocol(unknownProtocolUrl);
return false; return false;
break; }
case QNetworkReply::ContentAccessDenied: case QNetworkReply::ContentAccessDenied:
if (exOption->errorString.startsWith("AdBlock")) { if (exOption->errorString.startsWith("AdBlock")) {
if (exOption->frame != erPage->mainFrame()) { //Content in <iframe> if (exOption->frame != erPage->mainFrame()) { //Content in <iframe>