comparison libgaim/proxy.h @ 14262:baff095b146c

[gaim-migrate @ 16944] Rename GaimProxyConnectInfo to GaimProxyConnectData, and change the variables from connect_info to connect_data. Sorry, but I wanted to get this right before it becomes permanent. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 21 Aug 2006 05:25:44 +0000
parents 60b1bc8dbf37
children 118fd0dc5b6e
comparison
equal deleted inserted replaced
14261:bb060cdc23d1 14262:baff095b146c
54 char *username; /**< The username. */ 54 char *username; /**< The username. */
55 char *password; /**< The password. */ 55 char *password; /**< The password. */
56 56
57 } GaimProxyInfo; 57 } GaimProxyInfo;
58 58
59 typedef struct _GaimProxyConnectInfo GaimProxyConnectInfo; 59 typedef struct _GaimProxyConnectData GaimProxyConnectData;
60 60
61 typedef void (*GaimProxyConnectFunction)(gpointer data, gint source, const gchar *error_message); 61 typedef void (*GaimProxyConnectFunction)(gpointer data, gint source, const gchar *error_message);
62 62
63 63
64 #include "account.h" 64 #include "account.h"
235 * 235 *
236 * @return NULL if there was an error, or a reference to a data 236 * @return NULL if there was an error, or a reference to a data
237 * structure that can be used to cancel the pending 237 * structure that can be used to cancel the pending
238 * connection, if needed. 238 * connection, if needed.
239 */ 239 */
240 GaimProxyConnectInfo *gaim_proxy_connect(GaimAccount *account, 240 GaimProxyConnectData *gaim_proxy_connect(GaimAccount *account,
241 const char *host, int port, 241 const char *host, int port,
242 GaimProxyConnectFunction connect_cb, gpointer data); 242 GaimProxyConnectFunction connect_cb, gpointer data);
243 243
244 /** 244 /**
245 * Makes a connection through a SOCKS5 proxy. 245 * Makes a connection through a SOCKS5 proxy.
255 * 255 *
256 * @return NULL if there was an error, or a reference to a data 256 * @return NULL if there was an error, or a reference to a data
257 * structure that can be used to cancel the pending 257 * structure that can be used to cancel the pending
258 * connection, if needed. 258 * connection, if needed.
259 */ 259 */
260 GaimProxyConnectInfo *gaim_proxy_connect_socks5(GaimProxyInfo *gpi, 260 GaimProxyConnectData *gaim_proxy_connect_socks5(GaimProxyInfo *gpi,
261 const char *host, int port, 261 const char *host, int port,
262 GaimProxyConnectFunction connect_cb, gpointer data); 262 GaimProxyConnectFunction connect_cb, gpointer data);
263 263
264 /** 264 /**
265 * Cancel an in-progress connection attempt. This should be called 265 * Cancel an in-progress connection attempt. This should be called
268 * transfer, if we attempt to connect to a remote user but they 268 * transfer, if we attempt to connect to a remote user but they
269 * are behind a firewall then the PRPL can cancel the connection 269 * are behind a firewall then the PRPL can cancel the connection
270 * attempt early rather than just letting the OS's TCP/IP stack 270 * attempt early rather than just letting the OS's TCP/IP stack
271 * time-out the connection. 271 * time-out the connection.
272 */ 272 */
273 void gaim_proxy_connect_cancel(GaimProxyConnectInfo *connect_info); 273 void gaim_proxy_connect_cancel(GaimProxyConnectData *connect_data);
274 274
275 /*@}*/ 275 /*@}*/
276 276
277 #ifdef __cplusplus 277 #ifdef __cplusplus
278 } 278 }