libsoup r1184 - in trunk: . tests

[danw svn gnome org]

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

Log:
	* tests/Makefile.am (INCLUDES): add SOUP_MAINTAINER_FLAGS here
	too.

	* tests/dns.c (main):
	* tests/getbug.c (main):
	* tests/server-auth-test.c (do_test): replace deprecated glib
	functions


Modified:
   trunk/ChangeLog
   trunk/tests/Makefile.am
   trunk/tests/dns.c
   trunk/tests/getbug.c
   trunk/tests/server-auth-test.c

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

Modified: trunk/tests/dns.c
==============================================================================
--- trunk/tests/dns.c	(original)
+++ trunk/tests/dns.c	Mon Oct 20 15:06:16 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: trunk/tests/getbug.c
==============================================================================
--- trunk/tests/getbug.c	(original)
+++ trunk/tests/getbug.c	Mon Oct 20 15:06:16 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: trunk/tests/server-auth-test.c
==============================================================================
--- trunk/tests/server-auth-test.c	(original)
+++ trunk/tests/server-auth-test.c	Mon Oct 20 15:06:16 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);