summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Zesch <[email protected]>2012-05-29 12:19:30 -0400
committerSteve Zesch <[email protected]>2012-05-29 12:19:30 -0400
commit44ec5aed7c1c7130caee72d56cf3a234603ef0d0 (patch)
tree77336bd340dddfe49be8c49bec6a7d8c0a4912a5
parent561c43c0463a41e819f31f42e30991e802b593df (diff)
downloadlibmateweather-44ec5aed7c1c7130caee72d56cf3a234603ef0d0.tar.bz2
libmateweather-44ec5aed7c1c7130caee72d56cf3a234603ef0d0.tar.xz
libsoup-mate doesn't exist. Use libsoup-gnome instead.
-rw-r--r--configure.in12
-rw-r--r--libmateweather/weather-priv.h4
-rw-r--r--libmateweather/weather.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/configure.in b/configure.in
index 16cf530..721aae6 100644
--- a/configure.in
+++ b/configure.in
@@ -33,7 +33,7 @@ AM_CONDITIONAL(OS_WIN32, [test "$mateweather_native_win32" = "yes"])
GTK_REQUIRED=2.11.0
GLIB_REQUIRED=2.13.0
LIBSOUP_REQUIRED=2.4.0
-LIBSOUP_MATE_REQUIRED=1.1.0
+LIBSOUP_GNOME_REQUIRED=1.1.0
MATECONF_REQUIRED=1.1.0
LIBXML_REQUIRED=2.6.0
@@ -125,11 +125,11 @@ AC_SUBST(LIBXML_CFLAGS)
AC_SUBST(LIBXML_LIBS)
dnl -- check for libsoup (required) -----------------------------------------
-PKG_CHECK_MODULES(LIBSOUP_MATE,
- [libsoup-mate-2.4 >= $LIBSOUP_MATE_REQUIRED],
- [LIBSOUP_CFLAGS="$LIBSOUP_MATE_CFLAGS"
- LIBSOUP_LIBS="$LIBSOUP_MATE_LIBS"
- AC_DEFINE(HAVE_LIBSOUP_MATE, 1, [Have libsoup-mate])],
+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)
diff --git a/libmateweather/weather-priv.h b/libmateweather/weather-priv.h
index ccc7c2a..39534c7 100644
--- a/libmateweather/weather-priv.h
+++ b/libmateweather/weather-priv.h
@@ -24,8 +24,8 @@
#include <time.h>
#include <libintl.h>
#include <math.h>
-#ifdef HAVE_LIBSOUP_MATE
-#include <libsoup/soup-mate.h>
+#ifdef HAVE_LIBSOUP_GNOME
+#include <libsoup/soup-gnome.h>
#else
#include <libsoup/soup.h>
#endif
diff --git a/libmateweather/weather.c b/libmateweather/weather.c
index 19a8c09..e4084ac 100644
--- a/libmateweather/weather.c
+++ b/libmateweather/weather.c
@@ -549,8 +549,8 @@ _weather_info_fill (WeatherInfo *info,
if (!info->session) {
info->session = soup_session_async_new ();
-#ifdef HAVE_LIBSOUP_MATE
- soup_session_add_feature_by_type (info->session, SOUP_TYPE_PROXY_RESOLVER_MATE);
+#ifdef HAVE_LIBSOUP_GNOME
+ soup_session_add_feature_by_type (info->session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
#endif
}