diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-02-16 15:47:02 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2013-02-16 15:48:06 +0000 |
| commit | a3e1db12929ed26a6d589e796e38ac8627471fb6 (patch) | |
| tree | fb110c25bd4aee11b39486b14fe5af9d7bfe2e6d | |
| parent | 7de14c5dbe6805bd581bd4302dcbed3623b3e1c8 (diff) | |
soup: use default proxy resolver instead of deprecated GNOME proxy resolver
Apparently there's no reason to use it any longer. Drop libsoup-gnome
dependency while at it, now that we don't need anything from it any
more (it only consists entirely of deprecated API now anyways).
https://bugzilla.gnome.org/show_bug.cgi?id=693911
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | ext/soup/gstsouphttpsrc.c | 8 |
2 files changed, 2 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index ae1fc98ea..5b29cb965 100644 --- a/configure.ac +++ b/configure.ac @@ -824,14 +824,7 @@ AG_GST_CHECK_FEATURE(SHOUT2, [Shoutcast/Icecast client library], shout2, [ dnl *** soup *** translit(dnm, m, l) AM_CONDITIONAL(USE_SOUP, true) AG_GST_CHECK_FEATURE(SOUP, [soup http client plugin (2.4)], souphttpsrc, [ - PKG_CHECK_MODULES(SOUP, libsoup-gnome-2.4 >= 2.3.2, [ - HAVE_SOUP="yes" - AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, [soup gnome integration]) - ],[ - PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26.1, HAVE_SOUP="yes", [ - HAVE_SOUP="no" - ]) - ]) + PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.26.1, [HAVE_SOUP="yes"], [HAVE_SOUP="no"]) AC_SUBST(SOUP_CFLAGS) AC_SUBST(SOUP_LIBS) ]) diff --git a/ext/soup/gstsouphttpsrc.c b/ext/soup/gstsouphttpsrc.c index 451bc62e8..0a3b4c1e7 100644 --- a/ext/soup/gstsouphttpsrc.c +++ b/ext/soup/gstsouphttpsrc.c @@ -77,11 +77,7 @@ #endif #include <gst/gstelement.h> #include <gst/gst-i18n-plugin.h> -#ifdef HAVE_LIBSOUP_GNOME -#include <libsoup/soup-gnome.h> -#else #include <libsoup/soup.h> -#endif #include "gstsouphttpsrc.h" #include <gst/tag/tag.h> @@ -1214,9 +1210,7 @@ gst_soup_http_src_start (GstBaseSrc * bsrc) soup_session_async_new_with_options (SOUP_SESSION_ASYNC_CONTEXT, src->context, SOUP_SESSION_USER_AGENT, src->user_agent, SOUP_SESSION_TIMEOUT, src->timeout, -#ifdef HAVE_LIBSOUP_GNOME - SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_GNOME, -#endif + SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_PROXY_RESOLVER_DEFAULT, NULL); } else { src->session = |