Mercurial > pidgin
changeset 21799:f14da598bffe
merge of '078fbf9229f1725f0a5c49d8196cd59ee1d638b0'
and '5906d2431bf8290785e449b059fa995d73f2a4bc'
| author | Stu Tomlinson <stu@nosnilmot.com> |
|---|---|
| date | Fri, 07 Dec 2007 22:14:23 +0000 |
| parents | ca3271a66314 (current diff) b7e914cd1773 (diff) |
| children | 73aab5bdd830 |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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) {