libsoup r1183 - in trunk: . libsoup

[cosimoc svn gnome org]

Author: cosimoc
Date: Mon Oct 20 13:17:59 2008
New Revision: 1183
URL: http://svn.gnome.org/viewvc/libsoup?rev=1183&view=rev

Log:
2008-10-20  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	* libsoup/Makefile.am:
	* libsoup/soup-status.h:
	* libsoup/soup-types.h:
	* libsoup/soup-uri.c: (soup_uri_to_string):
	Build with G_DISABLE_DEPRECATED and G_DISABLE_SINGLE_INCLUDES; enforce
	the first switch under maintainer mode and the second one
	unconditionally (#557072).


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/libsoup/Makefile.am
   trunk/libsoup/soup-status.h
   trunk/libsoup/soup-types.h
   trunk/libsoup/soup-uri.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Oct 20 13:17:59 2008
@@ -50,6 +50,11 @@
 
 AC_SUBST(SOUP_DEBUG_FLAGS)
 
+# Set the maintainer flags
+if test "x$enable_maintainer_mode" = "xyes"; then
+	SOUP_MAINTAINER_FLAGS="-DG_DISABLE_DEPRECATED"
+	AC_SUBST(SOUP_MAINTAINER_FLAGS)
+fi
 
 dnl ***************************
 dnl *** Checks for programs ***
@@ -77,6 +82,7 @@
 if test "$GLIB_LIBS" = ""; then
    AC_MSG_ERROR(GLIB 2.15.3 or later is required to build libsoup)
 fi
+GLIB_CFLAGS="$GLIB_CFLAGS -DG_DISABLE_SINGLE_INCLUDES"
 
 PKG_CHECK_MODULES(XML, libxml-2.0)
 AC_SUBST(XML_CFLAGS)

Modified: trunk/libsoup/Makefile.am
==============================================================================
--- trunk/libsoup/Makefile.am	(original)
+++ trunk/libsoup/Makefile.am	Mon Oct 20 13:17:59 2008
@@ -8,6 +8,7 @@
 	-DG_LOG_DOMAIN=\"libsoup\" 	\
 	-I$(top_srcdir)			\
 	$(SOUP_DEBUG_FLAGS)		\
+	$(SOUP_MAINTAINER_FLAGS)	\
 	$(GLIB_CFLAGS)			\
 	$(XML_CFLAGS)			\
 	$(LIBGCRYPT_CFLAGS)		\

Modified: trunk/libsoup/soup-status.h
==============================================================================
--- trunk/libsoup/soup-status.h	(original)
+++ trunk/libsoup/soup-status.h	Mon Oct 20 13:17:59 2008
@@ -8,7 +8,7 @@
 #ifndef SOUP_STATUS_H
 #define SOUP_STATUS_H 1
 
-#include <glib/gmacros.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/libsoup/soup-types.h
==============================================================================
--- trunk/libsoup/soup-types.h	(original)
+++ trunk/libsoup/soup-types.h	Mon Oct 20 13:17:59 2008
@@ -6,7 +6,7 @@
 #ifndef SOUP_TYPES_H
 #define SOUP_TYPES_H 1
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <glib-object.h>
 
 #include <libsoup/soup-status.h>

Modified: trunk/libsoup/soup-uri.c
==============================================================================
--- trunk/libsoup/soup-uri.c	(original)
+++ trunk/libsoup/soup-uri.c	Mon Oct 20 13:17:59 2008
@@ -424,7 +424,7 @@
 	str = g_string_sized_new (20);
 
 	if (uri->scheme && !just_path_and_query)
-		g_string_sprintfa (str, "%s:", uri->scheme);
+		g_string_append_printf (str, "%s:", uri->scheme);
 	if (uri->host && !just_path_and_query) {
 		g_string_append (str, "//");
 		if (uri->user) {