From 4e84376e2865d8f59f4e630ad7d201fcf86f8b3e Mon Sep 17 00:00:00 2001 From: Christian Dywan Date: Thu, 8 Jan 2009 01:54:08 +0100 Subject: [PATCH] Require libSoup 2.23.1 instead of 2.23.0 --- midori/main.c | 4 ++-- midori/midori-preferences.c | 4 ++-- wscript | 3 +-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/midori/main.c b/midori/main.c index e4f97219..9614245a 100644 --- a/midori/main.c +++ b/midori/main.c @@ -1438,7 +1438,7 @@ cookie_jar_changed_cb (SoupCookieJar* jar, } #endif -#if HAVE_LIBSOUP_2_23_1 +#if HAVE_LIBSOUP /* The following code hooks up to any created cookie jar in order to load and save cookies. This is *not* a generally advisable technique but merely a preliminary workaround until WebKit exposes its @@ -1967,7 +1967,7 @@ main (int argc, return 1; } - #if HAVE_LIBSOUP_2_23_1 + #if HAVE_LIBSOUP /* This is a nasty trick that allows us to manipulate cookies even without having a pointer to the jar. */ soup_cookie_jar_get_type (); diff --git a/midori/midori-preferences.c b/midori/midori-preferences.c index c11f9869..0d1b4fe6 100644 --- a/midori/midori-preferences.c +++ b/midori/midori-preferences.c @@ -223,7 +223,7 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings, gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); } -#if HAVE_LIBSOUP_2_23_1 +#if HAVE_LIBSOUP static void midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, GParamSpec* pspec, @@ -530,7 +530,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences, WIDGET_ADD (button, 1, 2, 5, 6); /* Page "Network" */ - #if HAVE_LIBSOUP_2_23_1 + #if HAVE_LIBSOUP /* If a cookie jar was created, WebKit is using Soup */ if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, g_quark_from_static_string ("midori-has-jar"))) diff --git a/wscript b/wscript index 6f9a9147..31383330 100644 --- a/wscript +++ b/wscript @@ -116,8 +116,7 @@ def configure (conf): conf.check_message_custom ('single instance', 'support', single_instance) if option_enabled ('libsoup'): - check_pkg ('libsoup-2.4', '2.23.0', False) - check_pkg ('libsoup-2.4', '2.23.1', False, var='LIBSOUP_2_23_1') + check_pkg ('libsoup-2.4', '2.23.1', False) check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] else: