Review ssl widget generation code.

This also seems to fix some way problem about multiple widget creations

What about you, guys?

CCBUG:321226

2 files changed, 6 insertions, 17 deletions

diff --git a/src/webtab/webpage.cpp b/src/webtab/webpage.cpp
index fae67ce6..8f454759 100644
--- a/src/webtab/webpage.cpp
+++ b/src/webtab/webpage.cpp
@@ -48,7 +48,6 @@
 #include "websnap.h"
 #include "webtab.h"
 #include "sslinfodialog.h"
-#include "sslwidget.h"
 
 #include "searchengine.h"
 #include "webwindow.h"
@@ -893,18 +892,7 @@ bool WebPage::hasSslValid() const
 }
 
 
-void WebPage::showSSLInfo(QPoint pos)
+WebSslInfo WebPage::sslInfo()
 {
-    if (mainFrame()->url().scheme() == QL1S("https"))
-    {
-        SSLWidget *widget = new SSLWidget(mainFrame()->url(), _sslInfo, view());
-        widget->showAt(pos);
-    }
-    else
-    {
-        KMessageBox::information(view(),
-                                 i18n("This site does not contain SSL information."),
-                                 i18nc("Secure Sockets Layer", "SSL")
-                                );
-    }
+    return _sslInfo;
 }
diff --git a/src/webtab/webpage.h b/src/webtab/webpage.h
index 43073d58..0f768f73 100644
--- a/src/webtab/webpage.h
+++ b/src/webtab/webpage.h
@@ -63,6 +63,8 @@ public:
 
     bool hasSslValid() const;
 
+    WebSslInfo sslInfo();
+    
 public Q_SLOTS:
     void downloadAllContentsWithKGet();
 
@@ -84,8 +86,7 @@ private Q_SLOTS:
     void manageNetworkErrors(QNetworkReply *reply);
     void loadStarted();
     void loadFinished(bool);
-    void showSSLInfo(QPoint);
-
+    
     void copyToTempFileResult(KJob*);
 
 private:
@@ -94,7 +95,7 @@ private:
 
     ProtocolHandler _protHandler;
     WebSslInfo _sslInfo;
-
+    
     QString _mimeType;
     QString _suggestedFileName;