debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Require libSoup 2.23.1 instead of 2.23.0

Browse source
This commit is contained in:
Christian Dywan 2009-01-08 01:54:08 +01:00
parent a74fa5b3cd
commit 4e84376e28
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
midori/main.c
View file

@ -1438,7 +1438,7 @@ cookie_jar_changed_cb (SoupCookieJar* jar,
} }
#endif #endif
#if HAVE_LIBSOUP_2_23_1 #if HAVE_LIBSOUP
/* The following code hooks up to any created cookie jar in order to /* The following code hooks up to any created cookie jar in order to
load and save cookies. This is *not* a generally advisable technique load and save cookies. This is *not* a generally advisable technique
but merely a preliminary workaround until WebKit exposes its but merely a preliminary workaround until WebKit exposes its
@ -1967,7 +1967,7 @@ main (int argc,
return 1; return 1;
} }
#if HAVE_LIBSOUP_2_23_1 #if HAVE_LIBSOUP
/* This is a nasty trick that allows us to manipulate cookies /* This is a nasty trick that allows us to manipulate cookies
even without having a pointer to the jar. */ even without having a pointer to the jar. */
soup_cookie_jar_get_type (); soup_cookie_jar_get_type ();

4
midori/midori-preferences.c
View file

@ -223,7 +223,7 @@ midori_preferences_notify_preferred_encoding_cb (MidoriWebSettings* settings,
gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM); gtk_widget_set_sensitive (entry, preferred_encoding == MIDORI_ENCODING_CUSTOM);
} }
#if HAVE_LIBSOUP_2_23_1 #if HAVE_LIBSOUP
static void static void
midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings, midori_preferences_notify_identify_as_cb (MidoriWebSettings* settings,
GParamSpec* pspec, GParamSpec* pspec,
@ -530,7 +530,7 @@ midori_preferences_set_settings (MidoriPreferences* preferences,
WIDGET_ADD (button, 1, 2, 5, 6); WIDGET_ADD (button, 1, 2, 5, 6);
/* Page "Network" */ /* Page "Network" */
#if HAVE_LIBSOUP_2_23_1 #if HAVE_LIBSOUP
/* If a cookie jar was created, WebKit is using Soup */ /* If a cookie jar was created, WebKit is using Soup */
if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR, if (g_type_get_qdata (SOUP_TYPE_COOKIE_JAR,
g_quark_from_static_string ("midori-has-jar"))) g_quark_from_static_string ("midori-has-jar")))

3
wscript
View file

@ -116,8 +116,7 @@ def configure (conf):
conf.check_message_custom ('single instance', 'support', single_instance) conf.check_message_custom ('single instance', 'support', single_instance)
if option_enabled ('libsoup'): if option_enabled ('libsoup'):
check_pkg ('libsoup-2.4', '2.23.0', False) check_pkg ('libsoup-2.4', '2.23.1', False)
check_pkg ('libsoup-2.4', '2.23.1', False, var='LIBSOUP_2_23_1')
check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2') check_pkg ('libsoup-2.4', '2.25.2', False, var='LIBSOUP_2_25_2')
libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1] libsoup = ['not available','yes'][conf.env['HAVE_LIBSOUP'] == 1]
else: else: