Mercurial > pidgin.yaz
comparison libpurple/proxy.h @ 32513:06e0b6be6432
purple_proxy_connect_socks5() was deprecated in 2.8.0, and can be removed for 3.0.0.
author | andrew.victor@mxit.com |
---|---|
date | Mon, 05 Sep 2011 20:37:04 +0000 |
parents | ba74745ff179 |
children | 02a2e8183b1d |
comparison
equal
deleted
inserted
replaced
32512:968a51c4fa9d | 32513:06e0b6be6432 |
---|---|
305 PurpleProxyConnectData *purple_proxy_connect_socks5_account(void *handle, | 305 PurpleProxyConnectData *purple_proxy_connect_socks5_account(void *handle, |
306 PurpleAccount *account, PurpleProxyInfo *gpi, | 306 PurpleAccount *account, PurpleProxyInfo *gpi, |
307 const char *host, int port, | 307 const char *host, int port, |
308 PurpleProxyConnectFunction connect_cb, gpointer data); | 308 PurpleProxyConnectFunction connect_cb, gpointer data); |
309 | 309 |
310 #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_PROXY_C_) | |
311 /** | |
312 * Makes a connection through a SOCKS5 proxy. | |
313 * | |
314 * @param handle A handle that should be associated with this | |
315 * connection attempt. The handle can be used | |
316 * to cancel the connection attempt using the | |
317 * purple_proxy_connect_cancel_with_handle() | |
318 * function. | |
319 * @param gpi The PurpleProxyInfo specifying the proxy settings | |
320 * @param host The destination host. | |
321 * @param port The destination port. | |
322 * @param connect_cb The function to call when the connection is | |
323 * established. If the connection failed then | |
324 * fd will be -1 and error message will be set | |
325 * to something descriptive (hopefully). | |
326 * @param data User-defined data. | |
327 * | |
328 * @return NULL if there was an error, or a reference to an | |
329 * opaque data structure that can be used to cancel | |
330 * the pending connection, if needed. | |
331 * @deprecated Use purple_proxy_connect_socks5_account instead | |
332 */ | |
333 PurpleProxyConnectData *purple_proxy_connect_socks5(void *handle, | |
334 PurpleProxyInfo *gpi, | |
335 const char *host, int port, | |
336 PurpleProxyConnectFunction connect_cb, gpointer data); | |
337 #endif | |
338 | |
339 /** | 310 /** |
340 * Cancel an in-progress connection attempt. This should be called | 311 * Cancel an in-progress connection attempt. This should be called |
341 * by the PRPL if the user disables an account while it is still | 312 * by the PRPL if the user disables an account while it is still |
342 * performing the initial sign on. Or when establishing a file | 313 * performing the initial sign on. Or when establishing a file |
343 * transfer, if we attempt to connect to a remote user but they | 314 * transfer, if we attempt to connect to a remote user but they |