gvfs r2131 - in trunk: . daemon
- From: danw svn gnome org
- To: svn-commits-list gnome org
- Subject: gvfs r2131 - in trunk: . daemon
- Date: Thu, 11 Dec 2008 19:27:46 +0000 (UTC)
Author: danw
Date: Thu Dec 11 19:27:46 2008
New Revision: 2131
URL: http://svn.gnome.org/viewvc/gvfs?rev=2131&view=rev
Log:
* 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
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/daemon/gvfsbackendhttp.c
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Dec 11 19:27:46 2008
@@ -125,10 +125,10 @@
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
Modified: trunk/daemon/gvfsbackendhttp.c
==============================================================================
--- trunk/daemon/gvfsbackendhttp.c (original)
+++ trunk/daemon/gvfsbackendhttp.c Thu Dec 11 19:27:46 2008
@@ -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 @@
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 @@
"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 @@
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);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]