Updating branch refs/heads/master to e50685200acdd207be6e9478470b54e676aebd0f (commit) from 3868badbdcb922067b0407cf1eb591d746b4b75f (commit)
commit e50685200acdd207be6e9478470b54e676aebd0f Author: Christian Dywan <christ...@twotoasts.de> Date: Sun Nov 18 21:24:32 2012 +0100 Guard libsoup sub feature stubs behind HAVE_LIBSOUP_2_34_0 Fixes: https://bugs.launchpad.net/midori/+bug/1078081 katze/midori-hsts.vala | 2 ++ wscript | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/katze/midori-hsts.vala b/katze/midori-hsts.vala index 92c7b61..a145c1a 100644 --- a/katze/midori-hsts.vala +++ b/katze/midori-hsts.vala @@ -68,10 +68,12 @@ namespace Midori { catch (Error error) { } } +#if HAVE_LIBSOUP_2_34_0 /* No sub-features */ public bool add_feature (Type type) { return false; } public bool remove_feature (Type type) { return false; } public bool has_feature (Type type) { return false; } +#endif public void attach (Soup.Session session) { session.request_queued.connect (queued); } public void detach (Soup.Session session) { /* FIXME disconnect */ } diff --git a/wscript b/wscript index cff69b7..7466616 100644 --- a/wscript +++ b/wscript @@ -276,6 +276,7 @@ def configure (conf): 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) check_pkg ('libxml-2.0', '2.6') _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits