From 280d4219382713229ea217d890e412c2260d89b6 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Mon, 4 Apr 2011 16:29:25 +0200
Subject: [PATCH] Edited showing SSL status on ajax pages

---
 src/navigation/locationbar.cpp | 2 +-
 src/webview/webpage.cpp        | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/navigation/locationbar.cpp b/src/navigation/locationbar.cpp
index a62fbe409..998b5c051 100644
--- a/src/navigation/locationbar.cpp
+++ b/src/navigation/locationbar.cpp
@@ -257,7 +257,7 @@ void LocationBar::siteIconChanged()
         m_siteIcon->setIcon(QIcon(":icons/locationbar/unknownpage.png"));
     } else {
 //        QIcon icon(*icon_);
-        m_siteIcon->setIcon(icon_);
+        m_siteIcon->setIcon(QIcon(icon_.pixmap(16,16)));
     }
 }
 
diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
index e5e1e32cf..6c4738fd4 100644
--- a/src/webview/webpage.cpp
+++ b/src/webview/webpage.cpp
@@ -75,7 +75,10 @@ QSslCertificate WebPage::sslCertificate()
 //            return c;
 //    }
 //    return cert;
-    return m_SslCert;
+    if (mainFrame()->url().scheme() == "https")
+        return m_SslCert;
+    else
+        return QSslCertificate();
 }
 
 bool WebPage::acceptNavigationRequest(QWebFrame* frame, const QNetworkRequest &request, NavigationType type)