[libchamplain] Bump libsoup dependency to 2.34 and use default proxy resolver



commit 78d3f339b8dc35569419f2a9e13731521f647909
Author: Jiří Techet <techet gmail com>
Date:   Wed Feb 26 19:47:00 2014 +0100

    Bump libsoup dependency to 2.34 and use default proxy resolver

 champlain/champlain-network-bbox-tile-source.c |    4 +---
 champlain/champlain-network-tile-source.c      |    4 +---
 configure.ac                                   |    2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)
---
diff --git a/champlain/champlain-network-bbox-tile-source.c b/champlain/champlain-network-bbox-tile-source.c
index b7ae650..dde8f96 100644
--- a/champlain/champlain-network-bbox-tile-source.c
+++ b/champlain/champlain-network-bbox-tile-source.c
@@ -240,10 +240,8 @@ champlain_network_bbox_tile_source_init (ChamplainNetworkBboxTileSource *self)
   priv->proxy_uri = g_strdup ("");
   priv->soup_session = soup_session_async_new_with_options (
         "proxy-uri", soup_uri_new (priv->proxy_uri),
-#ifdef HAVE_LIBSOUP_GNOME
         SOUP_SESSION_ADD_FEATURE_BY_TYPE, 
-        SOUP_TYPE_PROXY_RESOLVER_GNOME,
-#endif
+        SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
         NULL);
   g_object_set (G_OBJECT (priv->soup_session),
       "user-agent", 
diff --git a/champlain/champlain-network-tile-source.c b/champlain/champlain-network-tile-source.c
index 0b35246..5e7b981 100644
--- a/champlain/champlain-network-tile-source.c
+++ b/champlain/champlain-network-tile-source.c
@@ -273,10 +273,8 @@ champlain_network_tile_source_init (ChamplainNetworkTileSource *tile_source)
 
   priv->soup_session = soup_session_async_new_with_options (
         "proxy-uri", NULL,
-#ifdef HAVE_LIBSOUP_GNOME
         SOUP_SESSION_ADD_FEATURE_BY_TYPE, 
-        SOUP_TYPE_PROXY_RESOLVER_GNOME,
-#endif
+        SOUP_TYPE_PROXY_RESOLVER_DEFAULT,
         NULL);
   g_object_set (G_OBJECT (priv->soup_session),
       "user-agent", 
diff --git a/configure.ac b/configure.ac
index 847b0d4..591db89 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ PKG_CHECK_MODULES(DEPS,
       cairo >= 1.4
       gio-2.0 >= 2.16
       sqlite3 >= 3.0
-      libsoup-2.4 >= 2.42
+      libsoup-2.4 >= 2.34
   ]
 )
 AC_SUBST(DEPS_CFLAGS)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]