Mercurial > pidgin.yaz
comparison src/protocols/oscar/peer.c @ 14108:7a205b430d19
[gaim-migrate @ 16742]
Removing the "error_cb" parameter for gaim_proxy_connect(), changing it
back to how it was. As I started making changes to oscar to support
canceling connection attempts, I realized that having a separate callback
for errors would result in more code duplication than was needed.
Originally I thought the separate callback would make things cleaner.
Anyway, sorry for the noise.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 14 Aug 2006 04:43:38 +0000 |
parents | b0566d50291f |
children | a21da42126d6 |
comparison
equal
deleted
inserted
replaced
14107:c0ee28af3ca2 | 14108:7a205b430d19 |
---|---|
704 g_free(tmp); | 704 g_free(tmp); |
705 } | 705 } |
706 | 706 |
707 conn->connect_info = gaim_proxy_connect(account, | 707 conn->connect_info = gaim_proxy_connect(account, |
708 conn->verifiedip, conn->port, | 708 conn->verifiedip, conn->port, |
709 peer_connection_established_cb, NULL, conn); | 709 peer_connection_established_cb, conn); |
710 if (conn->connect_info != NULL) | 710 if (conn->connect_info != NULL) |
711 { | 711 { |
712 /* Connecting... */ | 712 /* Connecting... */ |
713 conn->connect_timeout_timer = gaim_timeout_add(15000, | 713 conn->connect_timeout_timer = gaim_timeout_add(15000, |
714 peer_connection_tooktoolong, conn); | 714 peer_connection_tooktoolong, conn); |
739 g_free(tmp); | 739 g_free(tmp); |
740 } | 740 } |
741 | 741 |
742 conn->connect_info = gaim_proxy_connect(account, | 742 conn->connect_info = gaim_proxy_connect(account, |
743 conn->clientip, conn->port, | 743 conn->clientip, conn->port, |
744 peer_connection_established_cb, NULL, conn); | 744 peer_connection_established_cb, conn); |
745 if (conn->connect_info != NULL) | 745 if (conn->connect_info != NULL) |
746 { | 746 { |
747 /* Connecting... */ | 747 /* Connecting... */ |
748 conn->connect_timeout_timer = gaim_timeout_add(15000, | 748 conn->connect_timeout_timer = gaim_timeout_add(15000, |
749 peer_connection_tooktoolong, conn); | 749 peer_connection_tooktoolong, conn); |
811 } | 811 } |
812 | 812 |
813 conn->connect_info = gaim_proxy_connect(account, | 813 conn->connect_info = gaim_proxy_connect(account, |
814 (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER, | 814 (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER, |
815 PEER_PROXY_PORT, | 815 PEER_PROXY_PORT, |
816 peer_proxy_connection_established_cb, NULL, conn); | 816 peer_proxy_connection_established_cb, conn); |
817 if (conn->connect_info != NULL) | 817 if (conn->connect_info != NULL) |
818 { | 818 { |
819 /* Connecting... */ | 819 /* Connecting... */ |
820 return; | 820 return; |
821 } | 821 } |