http: Replace deprecated SoupRequester by SoupSession

https://bugzilla.gnome.org/show_bug.cgi?id=702624

2 files changed, 5 insertions, 12 deletions

diff --git a/daemon/gvfsbackendhttp.c b/daemon/gvfsbackendhttp.c
index c06d36b2..92caf5b3 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -35,7 +35,6 @@
 
 #define LIBSOUP_USE_UNSTABLE_REQUEST_API
 #include <libsoup/soup-gnome.h>
-#include <libsoup/soup-requester.h>
 
 #include "gvfsbackendhttp.h"
 #include "gvfshttpinputstream.h"
@@ -99,7 +98,7 @@ g_vfs_backend_http_init (GVfsBackendHttp *backend)
   g_object_set (G_OBJECT (backend->session_async), "use-thread-context", TRUE, NULL);
 
   /* Proxy handling */
-  proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_GNOME, NULL);
+  proxy_resolver = g_object_new (SOUP_TYPE_PROXY_RESOLVER_DEFAULT, NULL);
   soup_session_add_feature (backend->session, proxy_resolver);
   soup_session_add_feature (backend->session_async, proxy_resolver);
   g_object_unref (proxy_resolver);
@@ -121,10 +120,6 @@ g_vfs_backend_http_init (GVfsBackendHttp *backend)
   soup_session_add_feature (backend->session_async, content_decoder);
   g_object_unref (content_decoder);
 
-  /* Request API */
-  soup_session_add_feature_by_type (backend->session, SOUP_TYPE_REQUESTER);
-  soup_session_add_feature_by_type (backend->session_async, SOUP_TYPE_REQUESTER);
-
   /* Logging */
   debug = g_getenv ("GVFS_HTTP_DEBUG");
   if (debug)
diff --git a/daemon/gvfshttpinputstream.c b/daemon/gvfshttpinputstream.c
index c8dfefb9..d7eed197 100644
--- a/daemon/gvfshttpinputstream.c
+++ b/daemon/gvfshttpinputstream.c
@@ -27,7 +27,6 @@
 
 #define LIBSOUP_USE_UNSTABLE_REQUEST_API
 #include <libsoup/soup.h>
-#include <libsoup/soup-requester.h>
 #include <libsoup/soup-request-http.h>
 
 #include "gvfshttpinputstream.h"
@@ -40,7 +39,7 @@ G_DEFINE_TYPE_WITH_CODE (GVfsHttpInputStream, g_vfs_http_input_stream, G_TYPE_IN
 
 typedef struct {
   SoupURI *uri;
-  SoupRequester *requester;
+  SoupSession *session;
   SoupRequest *req;
   SoupMessage *msg;
   GInputStream *stream;
@@ -64,7 +63,7 @@ g_vfs_http_input_stream_finalize (GObject *object)
   GVfsHttpInputStreamPrivate *priv = G_VFS_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
 
   g_clear_pointer (&priv->uri, soup_uri_free);
-  g_clear_object (&priv->requester);
+  g_clear_object (&priv->session);
   g_clear_object (&priv->req);
   g_clear_object (&priv->msg);
   g_clear_object (&priv->stream);
@@ -99,8 +98,7 @@ g_vfs_http_input_stream_new (SoupSession *session,
   stream = g_object_new (G_VFS_TYPE_HTTP_INPUT_STREAM, NULL);
   priv = G_VFS_HTTP_INPUT_STREAM_GET_PRIVATE (stream);
 
-  priv->requester = (SoupRequester *)soup_session_get_feature (session, SOUP_TYPE_REQUESTER);
-  g_object_ref (priv->requester);
+  priv->session = g_object_ref (session);
   priv->uri = soup_uri_copy (uri);
 
   return G_INPUT_STREAM (stream);
@@ -115,7 +113,7 @@ g_vfs_http_input_stream_ensure_request (GInputStream *stream)
     {
       GError *error = NULL;
 
-      priv->req = soup_requester_request_uri (priv->requester, priv->uri, &error);
+      priv->req = soup_session_request_uri (priv->session, priv->uri, &error);
       g_assert_no_error (error);
       priv->msg = soup_request_http_get_message (SOUP_REQUEST_HTTP (priv->req));
       priv->offset = 0;