summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-02-13 10:18:36 +0100
committerStefano Karapetsas <[email protected]>2014-02-13 10:18:36 +0100
commit4078a30acd592022aebb1bbfc74cfab9573f3fa1 (patch)
treee87c6a0d32c2a524f4f0dcbb20920b41b06d34a2
parent66cd8e980685f72822e5666b6340811da1e4a7d1 (diff)
downloadlibmateweather-4078a30acd592022aebb1bbfc74cfab9573f3fa1.tar.bz2
libmateweather-4078a30acd592022aebb1bbfc74cfab9573f3fa1.tar.xz
Drop libsoup-gnome dependency
-rw-r--r--configure.ac12
-rw-r--r--libmateweather/weather-priv.h4
-rw-r--r--libmateweather/weather.c4
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);