Mercurial > pidgin
comparison libpurple/protocols/bonjour/jabber.c @ 27119:d078048fb03a
Pass the gc as the handle in a bunch of calls to purple_proxy_connect
This causes the connection attempt to be canceled/destroyed if the
gc is destroyed
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 18 Jun 2009 23:36:55 +0000 |
| parents | 9331016df8ac |
| children | 96cafa3d271c |
comparison
equal
deleted
inserted
replaced
| 27118:a9899d234dfa | 27119:d078048fb03a |
|---|---|
| 924 proxy_info = purple_proxy_info_new(); | 924 proxy_info = purple_proxy_info_new(); |
| 925 purple_account_set_proxy_info(jdata->account, proxy_info); | 925 purple_account_set_proxy_info(jdata->account, proxy_info); |
| 926 } | 926 } |
| 927 purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); | 927 purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); |
| 928 | 928 |
| 929 connect_data = purple_proxy_connect(NULL, jdata->account, | 929 connect_data = purple_proxy_connect( |
| 930 purple_account_get_connection(jdata->account), | |
| 931 jdata->account, | |
| 930 ip, bb->port_p2pj, _connected_to_buddy, pb); | 932 ip, bb->port_p2pj, _connected_to_buddy, pb); |
| 931 | 933 |
| 932 if (connect_data == NULL) { | 934 if (connect_data == NULL) { |
| 933 purple_debug_error("bonjour", "Unable to connect to buddy (%s).\n", to); | 935 purple_debug_error("bonjour", "Unable to connect to buddy (%s).\n", to); |
| 934 return NULL; | 936 return NULL; |