diff options
| author | Rohan Garg <rohangarg@kubuntu.org> | 2011-02-06 10:22:35 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2011-02-06 10:23:57 +0100 |
| commit | 2708d5cba0633ca90458e450effcf3f808af2ff1 (patch) | |
| tree | ddd05906c6215a4d05b9ea80f5ef0316ad4fd11c /src/webpage.cpp | |
| parent | Added an option to show current website favicon as rekonq window icon (diff) | |
| download | rekonq-2708d5cba0633ca90458e450effcf3f808af2ff1.tar.xz | |
Improve SSL managements, following the changes in kwebkitpart
Diffstat (limited to 'src/webpage.cpp')
| -rw-r--r-- | src/webpage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/webpage.cpp b/src/webpage.cpp index 7a7793ec..791bb367 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -311,7 +311,7 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r if (metaData.contains(QL1S("ssl_in_use"))) { WebSslInfo info; - info.fromMetaData(metaData.toVariant()); + info.restoreFrom(metaData.toVariant(), request.url()); info.setUrl(request.url()); _sslInfo = info; } @@ -601,7 +601,7 @@ void WebPage::manageNetworkErrors(QNetworkReply *reply) if (isMainFrameRequest && !_sslInfo.isValid()) { // Obtain and set the SSL information if any... - _sslInfo.fromMetaData(reply->attribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData))); + _sslInfo.restoreFrom(reply->attribute(static_cast<QNetworkRequest::Attribute>(KIO::AccessManager::MetaData)), reply->url()); _sslInfo.setUrl(reply->url()); } break; |