# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1197065663 0
# Node ID f14da598bffe09177b8f236bd0eb6ead49159356
# Parent  ca3271a663144908eb527f287f187c897c8baad8# Parent  b7e914cd1773182256d8bf9a397bdcf36c3bbcda
merge of '078fbf9229f1725f0a5c49d8196cd59ee1d638b0'
     and '5906d2431bf8290785e449b059fa995d73f2a4bc'

diff -r ca3271a66314 -r f14da598bffe libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c	Fri Dec 07 22:14:12 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Fri Dec 07 22:14:23 2007 +0000
@@ -788,7 +788,7 @@
 		}
 		purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE);
 
-		connect_data = purple_proxy_connect(data->account->gc, data->account,
+		connect_data = purple_proxy_connect(NULL, data->account,
 						    bb->ip, bb->port_p2pj, _connected_to_buddy, pb);
 
 		if (connect_data == NULL) {