From 2708d5cba0633ca90458e450effcf3f808af2ff1 Mon Sep 17 00:00:00 2001
From: Rohan Garg <rohangarg@kubuntu.org>
Date: Sun, 6 Feb 2011 10:22:35 +0100
Subject: Improve SSL managements, following the changes in kwebkitpart

---
 src/webpage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/webpage.cpp')

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;
-- 
cgit v1.2.1