libsoup r1261 - trunk/tests

[danw svn gnome org]

Author: danw
Date: Fri Apr  3 00:49:43 2009
New Revision: 1261
URL: http://svn.gnome.org/viewvc/libsoup?rev=1261&view=rev

Log:
Fix the -p option in tests/get again


Modified:
   trunk/tests/get.c

Modified: trunk/tests/get.c
==============================================================================
--- trunk/tests/get.c	(original)
+++ trunk/tests/get.c	Fri Apr  3 00:49:43 2009
@@ -293,7 +293,6 @@
 	if (synchronous) {
 		session = soup_session_sync_new_with_options (
 			SOUP_SESSION_SSL_CA_FILE, cafile,
-			SOUP_SESSION_PROXY_URI, proxy,
 #ifdef HAVE_GNOME
 			SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_GNOME_FEATURES_2_26,
 #endif
@@ -302,7 +301,6 @@
 	} else {
 		session = soup_session_async_new_with_options (
 			SOUP_SESSION_SSL_CA_FILE, cafile,
-			SOUP_SESSION_PROXY_URI, proxy,
 #ifdef HAVE_GNOME
 			SOUP_SESSION_ADD_FEATURE_BY_TYPE, SOUP_TYPE_GNOME_FEATURES_2_26,
 #endif
@@ -310,6 +308,16 @@
 			NULL);
 	}
 
+	/* Need to do this after creating the session, since adding
+	 * SOUP_TYPE_GNOME_FEATURE_2_26 will add a proxy resolver, thereby
+	 * bashing over the manually-set proxy.
+	 */
+	if (proxy) {
+		g_object_set (G_OBJECT (session), 
+			      SOUP_SESSION_PROXY_URI, proxy,
+			      NULL);
+	}
+
 	if (recurse) {
 		char *outdir;