From: Dan Winship <danw@src.gnome.org>
Date: Mon, 20 Oct 2008 15:06:16 +0000 (+0000)
Subject: add SOUP_MAINTAINER_FLAGS here too.
X-Git-Tag: LIBSOUP_2_25_1~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dec8dd1e6afb226bf1c95a36011ae57336a3ac2d;p=platform%2Fupstream%2Flibsoup.git

add SOUP_MAINTAINER_FLAGS here too.

	* 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

svn path=/trunk/; revision=1184
---

diff --git a/ChangeLog b/ChangeLog
index 7c4b57e..2b52658 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-10-20  Dan Winship  <danw@gnome.org>
+
+	* 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
+
 2008-10-20  Cosimo Cecchi  <cosimoc@gnome.org>
 
 	* configure.in:
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ff06482..7b9fbfd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,6 +2,7 @@ INCLUDES =		\
 	-I$(top_srcdir)	\
 	-DSRCDIR=\""$(srcdir)"\" \
 	-DLIBSOUP_DISABLE_DEPRECATED \
+	$(SOUP_MAINTAINER_FLAGS) \
 	$(XML_CFLAGS)	\
 	$(GLIB_CFLAGS)	\
 	$(LIBGNUTLS_CFLAGS)
diff --git a/tests/dns.c b/tests/dns.c
index e93b0a4..d0101ee 100644
--- a/tests/dns.c
+++ b/tests/dns.c
@@ -57,7 +57,7 @@ main (int argc, char **argv)
 	}
 
 	loop = g_main_loop_new (NULL, TRUE);
-	g_main_run (loop);
+	g_main_loop_run (loop);
 	g_main_loop_unref (loop);
 
 	return 0;
diff --git a/tests/getbug.c b/tests/getbug.c
index 19021e4..86ae304 100644
--- a/tests/getbug.c
+++ b/tests/getbug.c
@@ -76,7 +76,7 @@ got_response (SoupSession *session, SoupMessage *msg, gpointer user_data)
 	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 @@ main (int argc, char **argv)
 				    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;
diff --git a/tests/server-auth-test.c b/tests/server-auth-test.c
index af4ec61..51d40f4 100644
--- a/tests/server-auth-test.c
+++ b/tests/server-auth-test.c
@@ -100,7 +100,7 @@ do_test (int n, SoupURI *base_uri, const char *path,
 		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);