Mercurial > pidgin

comparison libgaim/protocols/oscar/peer.c @ 14262:baff095b146c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
14261:bb060cdc23d1 14262:baff095b146c
137 if (conn->type == OSCAR_CAPABILITY_DIRECTIM) 137 if (conn->type == OSCAR_CAPABILITY_DIRECTIM)
138 peer_odc_close(conn); 138 peer_odc_close(conn);
139 else if (conn->type == OSCAR_CAPABILITY_SENDFILE) 139 else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
140 peer_oft_close(conn); 140 peer_oft_close(conn);
141 141
142 if (conn->connect_info != NULL) 142 if (conn->connect_data != NULL)
143 { 143 {
144 gaim_proxy_connect_cancel(conn->connect_info); 144 gaim_proxy_connect_cancel(conn->connect_data);
145 conn->connect_info = NULL; 145 conn->connect_data = NULL;
146 } 146 }
147 147
148 if (conn->connect_timeout_timer != 0) 148 if (conn->connect_timeout_timer != 0)
149 { 149 {
150 gaim_timeout_remove(conn->connect_timeout_timer); 150 gaim_timeout_remove(conn->connect_timeout_timer);
486 { 486 {
487 PeerConnection *conn; 487 PeerConnection *conn;
488 488
489 conn = data; 489 conn = data;
490 490
491 conn->connect_info = NULL; 491 conn->connect_data = NULL;
492 gaim_timeout_remove(conn->connect_timeout_timer); 492 gaim_timeout_remove(conn->connect_timeout_timer);
493 conn->connect_timeout_timer = 0; 493 conn->connect_timeout_timer = 0;
494 494
495 if (source < 0) 495 if (source < 0)
496 { 496 {
700 gaim_conversation_write(conv, NULL, tmp, 700 gaim_conversation_write(conv, NULL, tmp,
701 GAIM_MESSAGE_SYSTEM, time(NULL)); 701 GAIM_MESSAGE_SYSTEM, time(NULL));
702 g_free(tmp); 702 g_free(tmp);
703 } 703 }
704 704
705 conn->connect_info = gaim_proxy_connect(account, 705 conn->connect_data = gaim_proxy_connect(account,
706 conn->verifiedip, conn->port, 706 conn->verifiedip, conn->port,
707 peer_connection_established_cb, conn); 707 peer_connection_established_cb, conn);
708 if (conn->connect_info != NULL) 708 if (conn->connect_data != NULL)
709 { 709 {
710 /* Connecting... */ 710 /* Connecting... */
711 conn->connect_timeout_timer = gaim_timeout_add(15000, 711 conn->connect_timeout_timer = gaim_timeout_add(15000,
712 peer_connection_tooktoolong, conn); 712 peer_connection_tooktoolong, conn);
713 return; 713 return;
735 gaim_conversation_write(conv, NULL, tmp, 735 gaim_conversation_write(conv, NULL, tmp,
736 GAIM_MESSAGE_SYSTEM, time(NULL)); 736 GAIM_MESSAGE_SYSTEM, time(NULL));
737 g_free(tmp); 737 g_free(tmp);
738 } 738 }
739 739
740 conn->connect_info = gaim_proxy_connect(account, 740 conn->connect_data = gaim_proxy_connect(account,
741 conn->clientip, conn->port, 741 conn->clientip, conn->port,
742 peer_connection_established_cb, conn); 742 peer_connection_established_cb, conn);
743 if (conn->connect_info != NULL) 743 if (conn->connect_data != NULL)
744 { 744 {
745 /* Connecting... */ 745 /* Connecting... */
746 conn->connect_timeout_timer = gaim_timeout_add(15000, 746 conn->connect_timeout_timer = gaim_timeout_add(15000,
747 peer_connection_tooktoolong, conn); 747 peer_connection_tooktoolong, conn);
748 return; 748 return;
806 gaim_conversation_write(conv, NULL, tmp, 806 gaim_conversation_write(conv, NULL, tmp,
807 GAIM_MESSAGE_SYSTEM, time(NULL)); 807 GAIM_MESSAGE_SYSTEM, time(NULL));
808 g_free(tmp); 808 g_free(tmp);
809 } 809 }
810 810
811 conn->connect_info = gaim_proxy_connect(account, 811 conn->connect_data = gaim_proxy_connect(account,
812 (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER, 812 (conn->proxyip != NULL) ? conn->proxyip : PEER_PROXY_SERVER,
813 PEER_PROXY_PORT, 813 PEER_PROXY_PORT,
814 peer_proxy_connection_established_cb, conn); 814 peer_proxy_connection_established_cb, conn);
815 if (conn->connect_info != NULL) 815 if (conn->connect_data != NULL)
816 { 816 {
817 /* Connecting... */ 817 /* Connecting... */
818 return; 818 return;
819 } 819 }
820 } 820 }