Require libSoup 2.23.1 instead of 2.23.0

diff --git a/midori/main.c b/midori/main.c
index e4f97219edfdd4bed94d546cf5b5d39a768679a9..9614245ad0fda08b2c3459410fa2a63512eca328 100644 (file)
--- 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 c11f986946e4021695035bb219dd9f67543112ae..0d1b4fe66668a61b642c17485f888f3709964520 100644 (file)
--- 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 6f9a91474a19cdeed96df5782fb63827634a4ba7..31383330a688943bd4fdc78fac240ca0ff700cf0 100644 (file)
--- 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: