libsoup r1185 - in branches/gnome-2-24: . libsoup tests

[danw svn gnome org]

Author: danw
Date: Mon Oct 20 15:07:14 2008
New Revision: 1185
URL: http://svn.gnome.org/viewvc/libsoup?rev=1185&view=rev

Log:
pull-ups from trunk


Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/configure.in
   branches/gnome-2-24/libsoup/Makefile.am
   branches/gnome-2-24/libsoup/soup-auth.c
   branches/gnome-2-24/libsoup/soup-status.h
   branches/gnome-2-24/libsoup/soup-types.h
   branches/gnome-2-24/libsoup/soup-uri.c
   branches/gnome-2-24/tests/Makefile.am
   branches/gnome-2-24/tests/dns.c
   branches/gnome-2-24/tests/getbug.c
   branches/gnome-2-24/tests/server-auth-test.c

Modified: branches/gnome-2-24/configure.in
==============================================================================
--- branches/gnome-2-24/configure.in	(original)
+++ branches/gnome-2-24/configure.in	Mon Oct 20 15:07:14 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: branches/gnome-2-24/libsoup/Makefile.am
==============================================================================
--- branches/gnome-2-24/libsoup/Makefile.am	(original)
+++ branches/gnome-2-24/libsoup/Makefile.am	Mon Oct 20 15:07:14 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: branches/gnome-2-24/libsoup/soup-auth.c
==============================================================================
--- branches/gnome-2-24/libsoup/soup-auth.c	(original)
+++ branches/gnome-2-24/libsoup/soup-auth.c	Mon Oct 20 15:07:14 2008
@@ -266,7 +266,7 @@
 	g_return_val_if_fail (auth_header != NULL, FALSE);
 
 	scheme = soup_auth_get_scheme_name (auth);
-	if (strncmp (auth_header, scheme, strlen (scheme)) != 0)
+	if (g_ascii_strncasecmp (auth_header, scheme, strlen (scheme)) != 0)
 		return FALSE;
 
 	params = soup_header_parse_param_list (auth_header + strlen (scheme));

Modified: branches/gnome-2-24/libsoup/soup-status.h
==============================================================================
--- branches/gnome-2-24/libsoup/soup-status.h	(original)
+++ branches/gnome-2-24/libsoup/soup-status.h	Mon Oct 20 15:07:14 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: branches/gnome-2-24/libsoup/soup-types.h
==============================================================================
--- branches/gnome-2-24/libsoup/soup-types.h	(original)
+++ branches/gnome-2-24/libsoup/soup-types.h	Mon Oct 20 15:07:14 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: branches/gnome-2-24/libsoup/soup-uri.c
==============================================================================
--- branches/gnome-2-24/libsoup/soup-uri.c	(original)
+++ branches/gnome-2-24/libsoup/soup-uri.c	Mon Oct 20 15:07:14 2008
@@ -415,6 +415,8 @@
 	GString *str;
 	char *return_result;
 
+	g_return_val_if_fail (uri != NULL, NULL);
+
 	/* IF YOU CHANGE ANYTHING IN THIS FUNCTION, RUN
 	 * tests/uri-parsing AFTERWARD.
 	 */
@@ -422,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) {

Modified: branches/gnome-2-24/tests/Makefile.am
==============================================================================
--- branches/gnome-2-24/tests/Makefile.am	(original)
+++ branches/gnome-2-24/tests/Makefile.am	Mon Oct 20 15:07:14 2008
@@ -2,6 +2,7 @@
 	-I$(top_srcdir)	\
 	-DSRCDIR=\""$(srcdir)"\" \
 	-DLIBSOUP_DISABLE_DEPRECATED \
+	$(SOUP_MAINTAINER_FLAGS) \
 	$(XML_CFLAGS)	\
 	$(GLIB_CFLAGS)	\
 	$(LIBGNUTLS_CFLAGS)

Modified: branches/gnome-2-24/tests/dns.c
==============================================================================
--- branches/gnome-2-24/tests/dns.c	(original)
+++ branches/gnome-2-24/tests/dns.c	Mon Oct 20 15:07:14 2008
@@ -57,7 +57,7 @@
 	}
 
 	loop = g_main_loop_new (NULL, TRUE);
-	g_main_run (loop);
+	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
 	return 0;

Modified: branches/gnome-2-24/tests/getbug.c
==============================================================================
--- branches/gnome-2-24/tests/getbug.c	(original)
+++ branches/gnome-2-24/tests/getbug.c	Mon Oct 20 15:07:14 2008
@@ -76,7 +76,7 @@
 	g_hash_table_foreach (hash, print_struct_field, NULL);
 	g_hash_table_destroy (hash);
 
-	g_main_quit (loop);
+	g_main_loop_quit (loop);
 }
 
 static void
@@ -141,7 +141,7 @@
 				    got_response, NULL);
 
 	loop = g_main_loop_new (NULL, TRUE);
-	g_main_run (loop);
+	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
 	return 0;

Modified: branches/gnome-2-24/tests/server-auth-test.c
==============================================================================
--- branches/gnome-2-24/tests/server-auth-test.c	(original)
+++ branches/gnome-2-24/tests/server-auth-test.c	Mon Oct 20 15:07:14 2008
@@ -100,7 +100,7 @@
 		g_child_watch_add (pid, curl_exited, &done);
 
 		while (!done)
-			g_main_iteration (TRUE);
+			g_main_context_iteration (NULL, TRUE);
 	} else
 		test_data.succeeded = FALSE;
 	g_ptr_array_free (args, TRUE);