[gvfs] http: Clean up usage of libsoup

[Ross Lagerwall <rossl src gnome org>]

commit 20418890e206f0e06e2e98c010733627a144e2fd
Author: Ross Lagerwall <rosslagerwall gmail com>
Date:   Fri Oct 11 10:06:30 2013 +0200

    http: Clean up usage of libsoup
    
    Use libsoup rather than libsoup-gnome since libsoup-gnome is not
    required anymore.
    
    Bump the libsoup requirement to 2.42 to prevent a build failure with old
    libsoups (undefined references to soup_session_request_uri).
    
    Don't include individual libsoup headers as recommended by the libsoup
    documentation.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=587890

 configure.ac                 |    4 ++--
 daemon/gvfsbackendhttp.c     |    3 +--
 daemon/gvfshttpinputstream.c |    2 --
 daemon/gvfshttpinputstream.h |    2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 65eec6b..eea6589 100644
--- a/configure.ac
+++ b/configure.ac
@@ -142,10 +142,10 @@ HTTP_CFLAGS=
 HTTP_LIBS=
 
 if test "x$enable_http" != "xno"; then
-  PKG_CHECK_EXISTS(libsoup-gnome-2.4 >= 2.34.0, msg_http=yes)
+  PKG_CHECK_EXISTS(libsoup-2.4 >= 2.42.0, msg_http=yes)
 
   if test "x$msg_http" = "xyes"; then
-    PKG_CHECK_MODULES(HTTP, libsoup-gnome-2.4 libxml-2.0)
+    PKG_CHECK_MODULES(HTTP, libsoup-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 aebe851..721656d 100644
--- a/daemon/gvfsbackendhttp.c
+++ b/daemon/gvfsbackendhttp.c
@@ -33,8 +33,7 @@
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 
-#define LIBSOUP_USE_UNSTABLE_REQUEST_API
-#include <libsoup/soup-gnome.h>
+#include <libsoup/soup.h>
 
 #include "gvfsbackendhttp.h"
 #include "gvfshttpinputstream.h"
diff --git a/daemon/gvfshttpinputstream.c b/daemon/gvfshttpinputstream.c
index d7eed19..85c997a 100644
--- a/daemon/gvfshttpinputstream.c
+++ b/daemon/gvfshttpinputstream.c
@@ -25,9 +25,7 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#define LIBSOUP_USE_UNSTABLE_REQUEST_API
 #include <libsoup/soup.h>
-#include <libsoup/soup-request-http.h>
 
 #include "gvfshttpinputstream.h"
 
diff --git a/daemon/gvfshttpinputstream.h b/daemon/gvfshttpinputstream.h
index dbd06d9..eb8acb0 100644
--- a/daemon/gvfshttpinputstream.h
+++ b/daemon/gvfshttpinputstream.h
@@ -20,7 +20,7 @@
 #define __G_VFS_HTTP_INPUT_STREAM_H__
 
 #include <gio/gio.h>
-#include <libsoup/soup-types.h>
+#include <libsoup/soup.h>
 
 G_BEGIN_DECLS