Mercurial > pidgin
diff libgaim/protocols/oscar/peer.c @ 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 | 645598a4ec04 |
line wrap: on
line diff
--- a/libgaim/protocols/oscar/peer.c Mon Aug 21 05:07:42 2006 +0000 +++ b/libgaim/protocols/oscar/peer.c Mon Aug 21 05:25:44 2006 +0000 @@ -139,10 +139,10 @@ else if (conn->type == OSCAR_CAPABILITY_SENDFILE) peer_oft_close(conn); - if (conn->connect_info != NULL) + if (conn->connect_data != NULL) { - gaim_proxy_connect_cancel(conn->connect_info); - conn->connect_info = NULL; + gaim_proxy_connect_cancel(conn->connect_data); + conn->connect_data = NULL; } if (conn->connect_timeout_timer != 0) @@ -488,7 +488,7 @@ conn = data; - conn->connect_info = NULL; + conn->connect_data = NULL; gaim_timeout_remove(conn->connect_timeout_timer); conn->connect_timeout_timer = 0; @@ -702,10 +702,10 @@ g_free(tmp); } - conn->connect_info = gaim_proxy_connect(account, + conn->connect_data = gaim_proxy_connect(account, conn->verifiedip, conn->port, peer_connection_established_cb, conn); - if (conn->connect_info != NULL) + if (conn->connect_data != NULL) { /* Connecting... */ conn->connect_timeout_timer = gaim_timeout_add(15000, @@ -737,10 +737,10 @@ g_free(tmp); } - conn->connect_info = gaim_proxy_connect(account, + conn->connect_data = gaim_proxy_connect(account, conn->clientip, conn->port, peer_connection_established_cb, conn); - if (conn->connect_info != NULL) + if (conn->connect_data != NULL) { /* Connecting... */ conn->connect_timeout_timer = gaim_timeout_add(15000, @@ -808,11 +808,11 @@ g_free(tmp); } - conn->connect_info = gaim_proxy_connect(account, + conn->connect_data = gaim_proxy_connect(account, (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER, PEER_PROXY_PORT, peer_proxy_connection_established_cb, conn); - if (conn->connect_info != NULL) + if (conn->connect_data != NULL) { /* Connecting... */ return;