changeset
merge of '3c378985358b246fc23b6faa84dbbc32b2b0de82'
Fri, 07 Dec 2007 22:14:23 +0000
- author
- Stu Tomlinson <nosnilmot@pidgin.im>
- date
- Fri, 07 Dec 2007 22:14:23 +0000
- changeset 21914
- 41d7ad45f900
- parent 21912
- 3c378985358b (current diff)
- parent 21913
- 011ccc1ac4a0 (diff)
- child 21915
- c08dfd143ca9
merge of '3c378985358b246fc23b6faa84dbbc32b2b0de82'
and '011ccc1ac4a09f62f825cb5ff26984ead42bcc68'
--- 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) {
