[libgweather] Remove dependency on libsoup-gnome.

[Giovanni Campagna <gcampagna src gnome org>]

commit 14ec956fa9ebf1f5e77bb137a8608636a2d4a139
Author: Giovanni Campagna <gcampagna src gnome org>
Date:   Tue Dec 18 17:00:39 2012 +0100

    Remove dependency on libsoup-gnome.
    
    libsoup-gnome is deprecated, and since 2.34 libsoup has all the features
    we need in core.
    Dependency was bumped accordingly.

 configure.ac               |   12 ++----------
 libgweather/weather-priv.h |    4 ----
 libgweather/weather.c      |    4 +---
 3 files changed, 3 insertions(+), 17 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f2e3be5..5096dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,8 +25,7 @@ AC_SUBST(LT_VERSION)
 
 GTK_REQUIRED=2.90.0
 GLIB_REQUIRED=2.35.1
-LIBSOUP_REQUIRED=2.4.0
-LIBSOUP_GNOME_REQUIRED=2.25.1
+LIBSOUP_REQUIRED=2.34.0
 LIBXML_REQUIRED=2.6.0
 
 LT_PREREQ([2.2.6])
@@ -68,14 +67,7 @@ dnl -- Check for libxml (required) ------------------------------------------
 PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED)
 
 dnl -- check for libsoup (required) -----------------------------------------
-PKG_CHECK_MODULES(LIBSOUP_GNOME,
-		  [libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED],
-		  [LIBSOUP_CFLAGS="$LIBSOUP_GNOME_CFLAGS"
-		   LIBSOUP_LIBS="$LIBSOUP_GNOME_LIBS"
-		   AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [Have libsoup-gnome])],
-		  [PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= $LIBSOUP_REQUIRED])])
-AC_SUBST(LIBSOUP_CFLAGS)
-AC_SUBST(LIBSOUP_LIBS)
+PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= $LIBSOUP_REQUIRED])
 
 dnl -- check for glib and gio (required) -----------------------------------------
 PKG_CHECK_MODULES(GIO,
diff --git a/libgweather/weather-priv.h b/libgweather/weather-priv.h
index 1c3344f..7ffd171 100644
--- a/libgweather/weather-priv.h
+++ b/libgweather/weather-priv.h
@@ -25,11 +25,7 @@
 #include <libintl.h>
 #include <math.h>
 #include <gio/gio.h>
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#else
 #include <libsoup/soup.h>
-#endif
 
 #include "gweather-weather.h"
 #include "gweather-location.h"
diff --git a/libgweather/weather.c b/libgweather/weather.c
index a9bf4ef..708dc27 100644
--- a/libgweather/weather.c
+++ b/libgweather/weather.c
@@ -434,9 +434,7 @@ gweather_info_update (GWeatherInfo *info)
 
     if (!priv->session) {
 	priv->session = soup_session_async_new ();
-#ifdef HAVE_LIBSOUP_GNOME
-	soup_session_add_feature_by_type (priv->session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-#endif
+	soup_session_add_feature_by_type (priv->session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
     }
 
     if (priv->providers & GWEATHER_PROVIDER_METAR)