[librest] proxy: Remove use of libsoup-gnome
- From: Christophe Fergeau <teuf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librest] proxy: Remove use of libsoup-gnome
- Date: Tue, 19 Jul 2016 11:12:21 +0000 (UTC)
commit 8f904a8e2bb38a7bf72245cdf2f1ecad17e9a720
Author: Christophe Fergeau <cfergeau redhat com>
Date: Mon Apr 18 18:29:08 2016 +0200
proxy: Remove use of libsoup-gnome
It has been deprecated for a long while, and we were only using it for
proxy support. However, now that we switched to using SoupSession rather
than SoupSession{Sync,Async}, a default proxy resolver will be used, so
we don't need to set it explicitly.
configure.ac | 14 --------------
rest/rest-proxy.c | 8 --------
2 files changed, 0 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 24b5eeb..9fd2615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,20 +45,6 @@ PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42)
PKG_CHECK_MODULES(XML, libxml-2.0)
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-AC_MSG_CHECKING([whether to use the GNOME environment])
-AC_ARG_WITH([gnome],[AS_HELP_STRING([--without-gnome], [disable support for GNOME environment])],
- [], [with_gnome=yes])
-
-AS_IF(
- [test "$with_gnome" = yes],
- [
- AC_MSG_RESULT([yes])
- AC_DEFINE([WITH_GNOME], 1, [Use GNOME])
- PKG_CHECK_MODULES(SOUP_GNOME, libsoup-gnome-2.4 >= 2.25.1)
- ],
- AC_MSG_RESULT([no])
-)
-
# gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have
# it on it's own line.
m4_ifdef([GTK_DOC_CHECK], [
diff --git a/rest/rest-proxy.c b/rest/rest-proxy.c
index ff2b394..a8ace6b 100644
--- a/rest/rest-proxy.c
+++ b/rest/rest-proxy.c
@@ -24,9 +24,6 @@
#include <string.h>
#include <libsoup/soup.h>
-#if WITH_GNOME
-#include <libsoup/soup-gnome.h>
-#endif
#include "rest-marshal.h"
#include "rest-proxy-auth-private.h"
@@ -412,11 +409,6 @@ rest_proxy_init (RestProxy *self)
g_object_bind_property (self, "ssl-ca-file",
priv->session, "ssl-ca-file",
G_BINDING_BIDIRECTIONAL);
-
-#if WITH_GNOME
- soup_session_add_feature_by_type (priv->session,
- SOUP_TYPE_PROXY_RESOLVER_GNOME);
-#endif
}
/**
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]