[libgdata] core: Fix 'soup_gnome_features_2_26_get_type' is deprecated warning
- From: Fabiano Fidêncio <ffidencio src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgdata] core: Fix 'soup_gnome_features_2_26_get_type' is deprecated warning
- Date: Thu, 21 Nov 2013 08:10:35 +0000 (UTC)
commit 60e1cf16c3986c052867e9b9bcc85e0b1a2b8bc8
Author: Fabiano Fidêncio <fidencio redhat com>
Date: Mon Nov 18 09:29:03 2013 +0100
core: Fix 'soup_gnome_features_2_26_get_type' is deprecated warning
GNOME 2.26 libsoup's feature was just the GNOME proxy resolver,
which is now provided as default GIO extension point.
More informations can be seen in:
[0]: https://git.gnome.org/browse/libsoup/commit/?id=4ded0924fd82e006f31a8e9089fd297fac15eef9
[1]: https://bugzilla.gnome.org/show_bug.cgi?id=573685
https://bugzilla.gnome.org/show_bug.cgi?id=712565
README | 3 +--
configure.ac | 4 ++--
gdata/gdata-service.c | 5 +----
3 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/README b/README
index a30c7b9..d60aef9 100644
--- a/README
+++ b/README
@@ -16,12 +16,11 @@ Dependencies
• glib-2.0 ≥ 2.31.0
• libxml-2.0
• gio-2.0 ≥ 2.17.3
- • libsoup-2.4 ≥ 2.37.91
+ • libsoup-2.4 ≥ 2.42.0
• liboauth ≥ 0.9.4
• json-glib ≥ 0.15.0
If compiling with --enable-gnome (for GNOME support):
- • libsoup-gnome-2.4
• gcr-base-3
• goa-1.0 ≥ 3.2
diff --git a/configure.ac b/configure.ac
index 94d18cb..c17e4ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ AC_SUBST(GDK_PIXBUF_LIBS)
PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK_REQS], [have_gtk=yes], [have_gtk=no])
AM_CONDITIONAL([HAVE_GTK], [test "x$have_gtk" = "xyes"])
-# GNOME support, which pulls in libsoup-gnome-2.4 to provide transparent proxy support and gcr-base-3 to
provide non-pageable memory
+# GNOME support, which pulls in gcr-base-3 to provide non-pageable memory
AC_MSG_CHECKING(whether to build with GNOME support)
AC_ARG_ENABLE(gnome, AS_HELP_STRING([--enable-gnome], [Whether to enable GNOME support]),, enable_gnome=yes)
AC_MSG_RESULT($enable_gnome)
@@ -103,7 +103,7 @@ AM_CONDITIONAL([ENABLE_GOA], [test "x$enable_goa" = "xyes" -a "x$enable_gnome" =
if test "x$enable_gnome" = "xyes"; then
GNOME_PACKAGES_PUBLIC=""
- GNOME_PACKAGES_PRIVATE="libsoup-gnome-2.4 gcr-base-3 libxml-2.0"
+ GNOME_PACKAGES_PRIVATE="gcr-base-3 libxml-2.0"
if test "x$enable_goa" = "xyes"; then
GNOME_PACKAGES_PUBLIC="$GNOME_PACKAGES_PUBLIC"
GNOME_PACKAGES_PRIVATE="$GNOME_PACKAGES_PRIVATE goa-1.0 >= $GOA_REQS"
diff --git a/gdata/gdata-service.c b/gdata/gdata-service.c
index ee6f5de..b752dc2 100644
--- a/gdata/gdata-service.c
+++ b/gdata/gdata-service.c
@@ -45,7 +45,6 @@
#include <stdarg.h>
#ifdef HAVE_GNOME
-#include <libsoup/soup-gnome-features.h>
#define GCR_API_SUBJECT_TO_CHANGE
#include <gcr/gcr-base.h>
#endif /* HAVE_GNOME */
@@ -2308,9 +2307,7 @@ _gdata_service_build_session (void)
"timeout", 0,
NULL);
-#ifdef HAVE_GNOME
- soup_session_add_feature_by_type (session, SOUP_TYPE_GNOME_FEATURES_2_26);
-#endif /* HAVE_GNOME */
+ soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_DEFAULT);
/* Log all libsoup traffic if debugging's turned on */
if (_gdata_service_get_log_level () > GDATA_LOG_MESSAGES) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]