[grilo] net: Remove old code

[Juan A. Suarez Romero <jasuarez src gnome org>]

commit 00cd48417c047ef03fc8e991ed9367f2dda0df44
Author: Juan A. Suarez Romero <jasuarez igalia com>
Date:   Fri Jun 14 16:59:34 2013 +0000

    net: Remove old code
    
    Bump libsoup2.4 minimal version requirement to 2.33.4, and get rid of code
    handling older versions.
    
    This simplifies the maintenance of code.

 configure.ac                                       |    7 +-
 libs/net/Makefile.am                               |   24 +--
 libs/net/grl-net-soup-stable.c                     |  203 --------------------
 .../{grl-net-soup-unstable.c => grl-net-soup.c}    |    0
 4 files changed, 7 insertions(+), 227 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 58af8c4..039bce7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -167,14 +167,10 @@ AM_CONDITIONAL(BUILD_GRILO_TEST_UI, test "x$HAVE_GTK" = "xyes")
 # NET LIBRARY
 # ----------------------------------------------------------
 
-PKG_CHECK_MODULES(NET, libsoup-2.4,
+PKG_CHECK_MODULES(NET, libsoup-2.4 >= 2.33.4,
                        HAVE_LIBSOUP=yes,
                        HAVE_LIBSOUP=no)
 
-PKG_CHECK_EXISTS([libsoup-2.4 >= 2.33.4],
-                [HAVE_CACHED_LIBSOUP=yes],
-                [HAVE_CACHED_LIBSOUP=no])
-
 PKG_CHECK_EXISTS([libsoup-2.4 >= 2.41.3],
                  [HAVE_LIBSOUP_REQUESTER_DEPRECATED=yes],
                  [HAVE_LIBSOUP_REQUESTER_DEPRECATED=no])
@@ -196,7 +192,6 @@ AC_ARG_ENABLE([grl_net],
         ])
 
 AM_CONDITIONAL(BUILD_GRILO_NET, test "x$HAVE_LIBSOUP" = "xyes")
-AM_CONDITIONAL(BUILD_GRILO_NET_WITH_CACHE, test "x$HAVE_CACHED_LIBSOUP" = "xyes")
 AM_CONDITIONAL(BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER, test "x$HAVE_LIBSOUP_REQUESTER_DEPRECATED" = 
"xyes")
 
 # ----------------------------------------------------------
diff --git a/libs/net/Makefile.am b/libs/net/Makefile.am
index 6e0e262..f4113d1 100644
--- a/libs/net/Makefile.am
+++ b/libs/net/Makefile.am
@@ -11,10 +11,11 @@ lib_LTLIBRARIES = libgrlnet- GRL_MAJORMINOR@.la
 libgrlnet_ GRL_MAJORMINOR@_la_DEPENDENCIES =   \
        $(top_builddir)/src/lib GRL_NAME@.la
 
-libgrlnet_ GRL_MAJORMINOR@_la_SOURCES = \
-       grl-net-private.c               \
-       grl-net-wc.c            \
-       grl-net-mock.c
+libgrlnet_ GRL_MAJORMINOR@_la_SOURCES =   \
+       grl-net-mock.c                         \
+       grl-net-private.c                      \
+       grl-net-soup.c                         \
+       grl-net-wc.c
 
 libgrlnet_ GRL_MAJORMINOR@_la_CFLAGS = \
        -I $(top_srcdir)/src            \
@@ -23,16 +24,6 @@ libgrlnet_ GRL_MAJORMINOR@_la_CFLAGS =       \
        $(DEPS_CFLAGS)                  \
        $(NET_CFLAGS)
 
-if BUILD_GRILO_NET_WITH_CACHE
-libgrlnet_ GRL_MAJORMINOR@_la_CFLAGS += \
-       -DLIBSOUP_WITH_CACHE
-libgrlnet_ GRL_MAJORMINOR@_la_SOURCES += \
-       grl-net-soup-unstable.c
-else
-libgrlnet_ GRL_MAJORMINOR@_la_SOURCES += \
-       grl-net-soup-stable.c
-endif
-
 if BUILD_GRILO_NET_WITH_DEPRECATED_REQUESTER
 libgrlnet_ GRL_MAJORMINOR@_la_CFLAGS += \
        -DLIBSOUP_REQUESTER_DEPRECATED
@@ -81,10 +72,7 @@ introspection_sources =      \
        $(gir_sources)
 
 GrlNet- GRL_MAJORMINOR@.gir: libgrlnet- GRL_MAJORMINOR@.la
-GrlNet_ GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 Soup-2.4
-if BUILD_GRILO_NET_WITH_CACHE
-GrlNet_ GRL_MAJORMINOR_NORM@_gir_INCLUDES += Gio-2.0
-endif
+GrlNet_ GRL_MAJORMINOR_NORM@_gir_INCLUDES = GObject-2.0 Gio-2.0 Soup-2.4
 GrlNet_ GRL_MAJORMINOR_NORM@_gir_CFLAGS = -I $(top_srcdir)/src \
        -I $(top_srcdir)/src/data -I $(top_srcdir)/libs
 GrlNet_ GRL_MAJORMINOR_NORM@_gir_LIBS = libgrlnet- GRL_MAJORMINOR@.la \
diff --git a/libs/net/grl-net-soup-unstable.c b/libs/net/grl-net-soup.c
similarity index 100%
rename from libs/net/grl-net-soup-unstable.c
rename to libs/net/grl-net-soup.c