From b72b755ba3c78f6b6eda72da6d577b84dbc8d6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Mon, 11 Jun 2012 10:00:00 +0000
Subject: [PATCH] OpenSSL does not work any more on Mac, check status in about;
 refs #130

---
 src/browser.hxx        |  6 ++++--
 src/swissbrowser_de.ts | 22 +++++++++++-----------
 src/swissbrowser_en.ts | 22 +++++++++++-----------
 src/swissbrowser_fr.ts | 22 +++++++++++-----------
 src/swissbrowser_it.ts | 22 +++++++++++-----------
 5 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/browser.hxx b/src/browser.hxx
index 8a94ccf..ea47751 100644
--- a/src/browser.hxx
+++ b/src/browser.hxx
@@ -832,7 +832,7 @@ class Browser: public QMainWindow, protected Ui::Browser {
                             "%3\n"
                             "%4\n"
                             "qt-%5 (%6)\n"
-                            "openssl-%7")
+                            "openssl-%7 (%9) %10")
                          .arg(VERSION)
                          .arg(BUILDDATE)
                          .arg(QString::fromStdString(proxy::version()))
@@ -840,7 +840,9 @@ class Browser: public QMainWindow, protected Ui::Browser {
                          .arg(qVersion())
                          .arg(QT_VERSION_STR)
                          .arg(SHLIB_VERSION_NUMBER)
-                         .arg(QApplication::applicationName()));
+                         .arg(QApplication::applicationName())
+                         .arg(OPENSSL_VERSION_TEXT)
+                         .arg(QSslSocket::supportsSsl()?"ok":"failed"));
     }
 
     void on_actionDebugLog_triggered() {
diff --git a/src/swissbrowser_de.ts b/src/swissbrowser_de.ts
index b33cbc0..02bc21b 100644
--- a/src/swissbrowser_de.ts
+++ b/src/swissbrowser_de.ts
@@ -344,17 +344,6 @@
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
@@ -403,6 +392,17 @@ openssl-%7</source>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Certificate</name>
diff --git a/src/swissbrowser_en.ts b/src/swissbrowser_en.ts
index 87b17db..f210b6c 100644
--- a/src/swissbrowser_en.ts
+++ b/src/swissbrowser_en.ts
@@ -344,17 +344,6 @@
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
@@ -403,6 +392,17 @@ openssl-%7</source>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Certificate</name>
diff --git a/src/swissbrowser_fr.ts b/src/swissbrowser_fr.ts
index b33cbc0..02bc21b 100644
--- a/src/swissbrowser_fr.ts
+++ b/src/swissbrowser_fr.ts
@@ -344,17 +344,6 @@
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
@@ -403,6 +392,17 @@ openssl-%7</source>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Certificate</name>
diff --git a/src/swissbrowser_it.ts b/src/swissbrowser_it.ts
index 9509f16..d6154da 100644
--- a/src/swissbrowser_it.ts
+++ b/src/swissbrowser_it.ts
@@ -344,17 +344,6 @@
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>%8
-Version: %1
-Builddate: %2
-Libraries:
-%3
-%4
-qt-%5 (%6)
-openssl-%7</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>%1</source>
         <translation type="unfinished"></translation>
@@ -403,6 +392,17 @@ openssl-%7</source>
         <source>Debug Log</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%8
+Version: %1
+Builddate: %2
+Libraries:
+%3
+%4
+qt-%5 (%6)
+openssl-%7 (%9) %10</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Certificate</name>