Mercurial > pidgin

comparison src/proxy.c @ 6040:80e3641ee9eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 6490] Various minor memleak fixes, and a rephrasing of an oscar error message. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Sun, 06 Jul 2003 06:57:42 +0000
parents 968a00c9f230
children ef9065e52582
comparison
equal deleted inserted replaced
6039:0c4d0c93c8c5 6040:80e3641ee9eb
1529 gaim_proxy_connect(GaimAccount *account, const char *host, int port, 1529 gaim_proxy_connect(GaimAccount *account, const char *host, int port,
1530 GaimInputFunction func, gpointer data) 1530 GaimInputFunction func, gpointer data)
1531 { 1531 {
1532 const char *connecthost = host; 1532 const char *connecthost = host;
1533 int connectport = port; 1533 int connectport = port;
1534 struct PHB *phb = g_new0(struct PHB, 1); 1534 struct PHB *phb;
1535 1535
1536 g_return_val_if_fail(host != NULL, -1); 1536 g_return_val_if_fail(host != NULL, -1);
1537 g_return_val_if_fail(port != 0 && port != -1, -1); 1537 g_return_val_if_fail(port != 0 && port != -1, -1);
1538 g_return_val_if_fail(func != NULL, -1); 1538 g_return_val_if_fail(func != NULL, -1);
1539
1540 phb = g_new0(struct PHB, 1);
1539 1541
1540 if (account == NULL || gaim_account_get_proxy_info(account) == NULL) 1542 if (account == NULL || gaim_account_get_proxy_info(account) == NULL)
1541 phb->gpi = gaim_global_proxy_get_info(); 1543 phb->gpi = gaim_global_proxy_get_info();
1542 else 1544 else
1543 phb->gpi = gaim_account_get_proxy_info(account); 1545 phb->gpi = gaim_account_get_proxy_info(account);