Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 23406:3c1f1bed5be2
merge of '57be04f07f9fdc005b620053ae4f09dd1e27ebb3'
and '582755b8228024381c2a9e110de35f0aaedd5dc1'
| author | Evan Schoenberg <evan.s@dreskin.net> |
|---|---|
| date | Wed, 02 Jul 2008 00:06:25 +0000 |
| parents | 67581872c47f |
| children | 4670851af098 |
comparison
equal
deleted
inserted
replaced
| 22892:c9bc2d0215ed | 23406:3c1f1bed5be2 |
|---|---|
| 237 * established. If the connection failed then | 237 * established. If the connection failed then |
| 238 * fd will be -1 and error message will be set | 238 * fd will be -1 and error message will be set |
| 239 * to something descriptive (hopefully). | 239 * to something descriptive (hopefully). |
| 240 * @param data User-defined data. | 240 * @param data User-defined data. |
| 241 * | 241 * |
| 242 * @return NULL if there was an error, or a reference to a data | 242 * @return NULL if there was an error, or a reference to an |
| 243 * structure that can be used to cancel the pending | 243 * opaque data structure that can be used to cancel |
| 244 * connection, if needed. | 244 * the pending connection, if needed. |
| 245 */ | 245 */ |
| 246 PurpleProxyConnectData *purple_proxy_connect(void *handle, | 246 PurpleProxyConnectData *purple_proxy_connect(void *handle, |
| 247 PurpleAccount *account, | 247 PurpleAccount *account, |
| 248 const char *host, int port, | 248 const char *host, int port, |
| 249 PurpleProxyConnectFunction connect_cb, gpointer data); | 249 PurpleProxyConnectFunction connect_cb, gpointer data); |
| 263 * established. If the connection failed then | 263 * established. If the connection failed then |
| 264 * fd will be -1 and error message will be set | 264 * fd will be -1 and error message will be set |
| 265 * to something descriptive (hopefully). | 265 * to something descriptive (hopefully). |
| 266 * @param data User-defined data. | 266 * @param data User-defined data. |
| 267 * | 267 * |
| 268 * @return NULL if there was an error, or a reference to a data | 268 * @return NULL if there was an error, or a reference to an |
| 269 * structure that can be used to cancel the pending | 269 * opaque data structure that can be used to cancel |
| 270 * connection, if needed. | 270 * the pending connection, if needed. |
| 271 */ | 271 */ |
| 272 PurpleProxyConnectData *purple_proxy_connect_socks5(void *handle, | 272 PurpleProxyConnectData *purple_proxy_connect_socks5(void *handle, |
| 273 PurpleProxyInfo *gpi, | 273 PurpleProxyInfo *gpi, |
| 274 const char *host, int port, | 274 const char *host, int port, |
| 275 PurpleProxyConnectFunction connect_cb, gpointer data); | 275 PurpleProxyConnectFunction connect_cb, gpointer data); |