libsoup r1233 - in trunk: . docs/reference libsoup

[danw svn gnome org]

Author: danw
Date: Mon Feb  2 17:28:46 2009
New Revision: 1233
URL: http://svn.gnome.org/viewvc/libsoup?rev=1233&view=rev

Log:
	* libsoup/soup-proxy-resolver-gconf.h:
	* libsoup/soup-proxy-resolver-gconf.c: Remove this, as it was
	incomplete, and libproxy is now officially a dependency of GNOME.

	* libsoup/Makefile.am:
	* libsoup/soup-gnome-features.c: remove gconf-vs-libproxy ifdefs

	* configure.in: Remove GConf checks, require libproxy if building
	libsoup-gnome.


Removed:
   trunk/libsoup/soup-proxy-resolver-gconf.c
   trunk/libsoup/soup-proxy-resolver-gconf.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/docs/reference/Makefile.am
   trunk/libsoup/Makefile.am
   trunk/libsoup/soup-gnome-features.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Feb  2 17:28:46 2009
@@ -185,35 +185,28 @@
 	AC_DEFINE(HAVE_GNOME, 1, [Defined if GNOME support is enabled])
 
 	PKG_CHECK_MODULES(LIBPROXY, libproxy-1.0,
-			  have_libproxy=yes, have_libproxy=no)
-	if test $have_libproxy = yes; then
-		AC_DEFINE(HAVE_LIBPROXY, 1, [Defined if libproxy support is enabled])
-	else
-		PKG_CHECK_MODULES(GCONF, gconf-2.0, , [AC_MSG_ERROR(dnl
-[Could not find libproxy or GConf:
+			  :, [AC_MSG_ERROR(dnl
+[Could not find libproxy:
 
 $LIBPROXY_PKG_ERRORS
 
-$GCONF_PKG_ERRORS
+libproxy is now a dependency of GNOME, and is required for proxy
+support in libsoup.
 
-One or the other is required for GNOME proxy support.
-Pass "--without-gnome" to configure if you want to build without GNOME support.])])
-	fi
+Pass "--without-gnome" to configure if you want to build libsoup
+without GNOME support.])])
 
 	PKG_CHECK_MODULES(SQLITE, sqlite3, :, [AC_MSG_ERROR(dnl
 [Could not find sqlite3 devel files:
 
 $SQLITE_PKG_ERRORS
 
-Pass "--without-gnome" to configure if you want to build without GNOME support.])])
+Pass "--without-gnome" to configure if you want to build libsoup
+without GNOME support.])])
 fi
 AC_SUBST(HAVE_GNOME)
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
-AC_SUBST(HAVE_LIBPROXY)
 AC_SUBST(LIBPROXY_CFLAGS)
 AC_SUBST(LIBPROXY_LIBS)
-AM_CONDITIONAL(WITH_LIBPROXY, [test -n "$LIBPROXY_LIBS"])
 AC_SUBST(SQLITE_CFLAGS)
 AC_SUBST(SQLITE_LIBS)
 

Modified: trunk/docs/reference/Makefile.am
==============================================================================
--- trunk/docs/reference/Makefile.am	(original)
+++ trunk/docs/reference/Makefile.am	Mon Feb  2 17:28:46 2009
@@ -35,8 +35,7 @@
 	soup-connection.h soup-connection-ntlm.h \
 	soup-dns.h soup-auth-manager.h soup-auth-manager-ntlm.h \
 	soup-message-queue.h soup-path-map.h soup-ssl.h \
-	soup-proxy-resolver-libproxy.h soup-proxy-resolver-gconf.h \
-	soup-proxy-resolver-static.h
+	soup-proxy-resolver-libproxy.h soup-proxy-resolver-static.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES = 

Modified: trunk/libsoup/Makefile.am
==============================================================================
--- trunk/libsoup/Makefile.am	(original)
+++ trunk/libsoup/Makefile.am	Mon Feb  2 17:28:46 2009
@@ -11,7 +11,6 @@
 	$(SOUP_MAINTAINER_FLAGS)	\
 	$(GLIB_CFLAGS)			\
 	$(XML_CFLAGS)			\
-	$(GCONF_CFLAGS)			\
 	$(LIBPROXY_CFLAGS)		\
 	$(SQLITE_CFLAGS)		\
 	$(LIBGCRYPT_CFLAGS)		\
@@ -175,31 +174,17 @@
 libsoup_gnome_2_4_la_LIBADD =		\
 	libsoup-2.4.la			\
 	$(GLIB_LIBS)			\
+	$(LIBPROXY_LIBS)		\
 	$(SQLITE_LIBS)
 
 libsoup_gnome_2_4_la_SOURCES =		\
 	soup-cookie-jar-sqlite.c	\
-	soup-gnome-features.c
-
-if WITH_LIBPROXY
-libsoup_gnome_2_4_la_SOURCES +=		\
+	soup-gnome-features.c		\
 	soup-proxy-resolver-libproxy.h	\
 	soup-proxy-resolver-libproxy.c
 
-libsoup_gnome_2_4_la_LIBADD +=		\
-	$(LIBPROXY_LIBS)
-else
-libsoup_gnome_2_4_la_SOURCES +=		\
-	soup-proxy-resolver-gconf.h	\
-	soup-proxy-resolver-gconf.c
-
-libsoup_gnome_2_4_la_LIBADD +=		\
-	$(GCONF_LIBS)
 endif
 
-endif
-
-
 EXTRA_DIST=				\
 	soup-marshal.list		\
 	soup-enum-types.h.tmpl		\

Modified: trunk/libsoup/soup-gnome-features.c
==============================================================================
--- trunk/libsoup/soup-gnome-features.c	(original)
+++ trunk/libsoup/soup-gnome-features.c	Mon Feb  2 17:28:46 2009
@@ -11,11 +11,7 @@
 
 #include "soup-gnome-features.h"
 
-#ifdef HAVE_LIBPROXY
 #include "soup-proxy-resolver-libproxy.h"
-#else
-#include "soup-proxy-resolver-gconf.h"
-#endif
 
 /**
  * SOUP_TYPE_PROXY_RESOLVER_GNOME:
@@ -32,19 +28,15 @@
 GType
 soup_proxy_resolver_gnome_get_type (void)
 {
-#ifdef HAVE_LIBPROXY
 	return SOUP_TYPE_PROXY_RESOLVER_LIBPROXY;
-#else
-	return SOUP_TYPE_PROXY_RESOLVER_GCONF;
-#endif
 }
 
 /**
  * SOUP_TYPE_GNOME_FEATURES_2_26:
  *
  * This returns the #GType of a #SoupSessionFeature that automatically
- * adds all of the GNOME features defined for libsoup 2.26. At the
- * moment, this is just %SOUP_TYPE_PROXY_RESOLVER_GNOME.
+ * adds all of the GNOME features defined for libsoup 2.26 (which is
+ * just %SOUP_TYPE_PROXY_RESOLVER_GNOME).
  *
  * You can add this to a session using
  * soup_session_add_feature_by_type() or by using the