[Xfce4-commits] <midori:master> Drop obsolete libSoup version checks

[Christian Dywan]

Updating branch refs/heads/master
         to d9ca4bc8eda1c442f86e41ad59f058c6f9f07c1d (commit)
       from 7b9c0c96895a088b74d18e2bb7d3e66f7756e148 (commit)

commit d9ca4bc8eda1c442f86e41ad59f058c6f9f07c1d
Author: Christian Dywan <christian at twotoasts.de>
Date:   Wed Feb 27 23:00:43 2013 +0100

    Drop obsolete libSoup version checks

 midori/midori-view.c |    2 +-
 wscript              |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/midori/midori-view.c b/midori/midori-view.c
index 8529a2a..910c6b8 100644
--- a/midori/midori-view.c
+++ b/midori/midori-view.c
@@ -1529,7 +1529,7 @@ webkit_web_view_hovering_over_link_cb (WebKitWebView* web_view,
                                        const gchar*   link_uri,
                                        MidoriView*    view)
 {
-    #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_3))
+    #if !(WEBKIT_CHECK_VERSION (1, 3, 1) && defined (HAVE_LIBSOUP_2_29_91))
     sokoke_prefetch_uri (view->settings, link_uri, NULL, NULL);
     #endif
 
diff --git a/wscript b/wscript
index 45fa68b..d19d0eb 100644
--- a/wscript
+++ b/wscript
@@ -286,23 +286,21 @@ def configure (conf):
     conf.define ('HAVE_UNIQUE', [0,1][conf.env['UNIQUE_VERSION'] != 'No'])
 
     check_pkg ('libsoup-2.4', '2.27.90', var='LIBSOUP')
-    if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
-        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
         conf.define ('HAVE_LIBSOUP_2_29_91', 1)
-    if check_version (conf.env['LIBSOUP_VERSION'], 2, 33, 4):
-        conf.define ('HAVE_LIBSOUP_2_33_4', 1)
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 34, 0):
         conf.define ('HAVE_LIBSOUP_2_34_0', 1)
         conf.env.append_value ('VALAFLAGS', '-D HAVE_LIBSOUP_2_34_0')
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
         conf.define ('HAVE_LIBSOUP_2_37_1', 1)
+
     if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 8):
         conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_8')
     if check_version (conf.env['WEBKIT_VERSION'], 1, 3, 13):
         conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_3_13')
     if check_version (conf.env['WEBKIT_VERSION'], 1, 8, 0):
         conf.env.append_value ('VALAFLAGS', '-D HAVE_WEBKIT_1_8_0')
+
     check_pkg ('libxml-2.0', '2.6')
     conf.undefine ('LIBXML_VERSION') # Defined in xmlversion.h
     check_pkg ('sqlite3', '3.6.19', var='SQLITE')