[Xfce4-commits] <midori:master> Use system ca file from libsoup if possible

Christian Dywan noreply at xfce.org
Sun Dec 11 02:58:01 CET 2011


Updating branch refs/heads/master
         to 566794a67e842024cfc371c369892ba42e66ab21 (commit)
       from 35757c28429af1e431c15c38288412095841df8d (commit)

commit 566794a67e842024cfc371c369892ba42e66ab21
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sun Dec 11 02:11:36 2011 +0100

    Use system ca file from libsoup if possible

 midori/main.c |    7 ++++++-
 wscript       |    1 +
 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/midori/main.c b/midori/main.c
index 9e4d622..84846ac 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -993,7 +993,12 @@ midori_load_soup_session (gpointer settings)
 {
     SoupSession* session = webkit_get_default_session ();
 
-    #if defined (HAVE_LIBSOUP_2_29_91)
+    #if defined (HAVE_LIBSOUP_2_37_1)
+    g_object_set (session,
+                  "ssl-use-system-ca-file", TRUE,
+                  "ssl-strict", FALSE,
+                  NULL);
+    #elif defined (HAVE_LIBSOUP_2_29_91)
     const gchar* certificate_files[] =
     {
         "/etc/pki/tls/certs/ca-bundle.crt",
diff --git a/wscript b/wscript
index f18090e..97c5be3 100644
--- a/wscript
+++ b/wscript
@@ -243,6 +243,7 @@ def configure (conf):
     conf.define ('HAVE_LIBSOUP_2_27_90', 1)
     check_pkg ('libsoup-2.4', '2.29.3', False, var='LIBSOUP_2_29_3')
     check_pkg ('libsoup-2.4', '2.29.91', False, var='LIBSOUP_2_29_91')
+    check_pkg ('libsoup-2.4', '2.37.1', False, var='LIBSOUP_2_37_1')
     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
     check_pkg ('libxml-2.0', '2.6')
     check_pkg ('sqlite3', '3.0', True, var='SQLITE')


More information about the Xfce4-commits mailing list