diff options
| author | Dan Winship <danw@src.gnome.org> | 2008-12-11 19:27:46 +0000 |
|---|---|---|
| committer | Dan Winship <danw@src.gnome.org> | 2008-12-11 19:27:46 +0000 |
| commit | 297cefc8d3215f6400f260ff6ba54a6925bdb471 (patch) | |
| tree | 2a39a7f867edba89ad8725f7c3e9c55d1b9e0b63 | |
| parent | ee9b0a42c582a38eddba244a6630ec5c560b12e6 (diff) | |
| download | gvfs-297cefc8d3215f6400f260ff6ba54a6925bdb471.tar.gz | |
require libsoup-gnome, for SoupProxyResolverGNOME
* configure.ac: require libsoup-gnome, for SoupProxyResolverGNOME
* daemon/gvfsbackendhttp.c (g_vfs_backend_http_init): add a
SoupProxyResolverGNOME to the sessions, to automatically handle
proxies. #522985
svn path=/trunk/; revision=2131
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | daemon/gvfsbackendhttp.c | 15 |
3 files changed, 21 insertions, 6 deletions
@@ -1,5 +1,13 @@ 2008-12-11 Dan Winship <danw@gnome.org> + * configure.ac: require libsoup-gnome, for SoupProxyResolverGNOME + + * daemon/gvfsbackendhttp.c (g_vfs_backend_http_init): add a + SoupProxyResolverGNOME to the sessions, to automatically handle + proxies. #522985 + +2008-12-11 Dan Winship <danw@gnome.org> + * daemon/soup-input-stream.c (read_async_done) (soup_input_stream_read_async, soup_input_stream_close_async): don't leak GSimpleAsyncResults. #551075. diff --git a/configure.ac b/configure.ac index 5e1cca2f..063e761a 100644 --- a/configure.ac +++ b/configure.ac @@ -125,10 +125,10 @@ HTTP_CFLAGS= HTTP_LIBS= if test "x$enable_http" != "xno"; then - PKG_CHECK_EXISTS(libsoup-2.4 >= 2.23.91, msg_http=yes) + PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.25.1, msg_http=yes) if test "x$msg_http" == "xyes"; then - PKG_CHECK_MODULES(HTTP, libsoup-2.4 libxml-2.0) + PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0) AC_DEFINE(HAVE_HTTP, 1, [Define to 1 if http/dav is going to be built]) fi fi diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c index 332c962a..5b4391a0 100644 --- a/daemon/gvfsbackendhttp.c +++ b/daemon/gvfsbackendhttp.c @@ -33,7 +33,7 @@ #include <glib/gi18n.h> #include <gio/gio.h> -#include <libsoup/soup.h> +#include <libsoup/soup-gnome.h> #include "gvfsbackendhttp.h" #include "gvfsjobopenforread.h" #include "gvfsjobread.h" @@ -79,7 +79,8 @@ g_vfs_backend_http_finalize (GObject *object) static void g_vfs_backend_http_init (GVfsBackendHttp *backend) { - const char *debug; + const char *debug; + SoupSessionFeature *proxy_resolver; g_vfs_backend_set_user_visible (G_VFS_BACKEND (backend), FALSE); @@ -91,6 +92,12 @@ g_vfs_backend_http_init (GVfsBackendHttp *backend) "gvfs/" VERSION, NULL); + /* Proxy handling */ + proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_GNOME, NULL); + soup_session_add_feature (backend->session, proxy_resolver); + soup_session_add_feature (backend->session_async, proxy_resolver); + g_object_unref (proxy_resolver); + /* Logging */ debug = g_getenv ("GVFS_HTTP_DEBUG"); if (debug) @@ -107,8 +114,8 @@ g_vfs_backend_http_init (GVfsBackendHttp *backend) level = SOUP_LOGGER_LOG_MINIMAL; logger = soup_logger_new (level, DEBUG_MAX_BODY_SIZE); - soup_logger_attach (logger, backend->session); - soup_logger_attach (logger, backend->session_async); + soup_session_add_feature (backend->session, SOUP_SESSION_FEATURE (logger)); + soup_session_add_feature (backend->session_async, SOUP_SESSION_FEATURE (logger)); g_object_unref (logger); } |