From 4078a30acd592022aebb1bbfc74cfab9573f3fa1 Mon Sep 17 00:00:00 2001
From: Stefano Karapetsas <stefano@karapetsas.com>
Date: Thu, 13 Feb 2014 10:18:36 +0100
Subject: Drop libsoup-gnome dependency

---
 configure.ac                  | 12 ++----------
 libmateweather/weather-priv.h |  4 ----
 libmateweather/weather.c      |  4 +---
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 119bfdc..1a8433a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,8 +51,7 @@ esac
 AC_SUBST(GTK_API_VERSION)
 
 GLIB_REQUIRED=2.13.0
-LIBSOUP_REQUIRED=2.4.0
-LIBSOUP_GNOME_REQUIRED=1.1.0
+LIBSOUP_REQUIRED=2.34.0
 GIO_REQUIRED=2.25.0
 LIBXML_REQUIRED=2.6.0
 
@@ -145,14 +144,7 @@ AC_SUBST(LIBXML_CFLAGS)
 AC_SUBST(LIBXML_LIBS)
 
 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 gio (required) -----------------------------------------
 PKG_CHECK_MODULES(GIO,
diff --git a/libmateweather/weather-priv.h b/libmateweather/weather-priv.h
index 39534c7..e602f7b 100644
--- a/libmateweather/weather-priv.h
+++ b/libmateweather/weather-priv.h
@@ -24,11 +24,7 @@
 #include <time.h>
 #include <libintl.h>
 #include <math.h>
-#ifdef HAVE_LIBSOUP_GNOME
-#include <libsoup/soup-gnome.h>
-#else
 #include <libsoup/soup.h>
-#endif
 
 #include "weather.h"
 #include "mateweather-location.h"
diff --git a/libmateweather/weather.c b/libmateweather/weather.c
index e4084ac..d52f711 100644
--- a/libmateweather/weather.c
+++ b/libmateweather/weather.c
@@ -549,9 +549,7 @@ _weather_info_fill (WeatherInfo *info,
 
     if (!info->session) {
 	info->session = soup_session_async_new ();
-#ifdef HAVE_LIBSOUP_GNOME
-	soup_session_add_feature_by_type (info->session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
-#endif
+	soup_session_add_feature_by_type (info->session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
     }
 
     metar_start_open (info);
-- 
cgit v1.2.1