Mercurial > pidgin.yaz
comparison libgaim/protocols/jabber/si.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 |
comparison
equal
deleted
inserted
replaced
14261:bb060cdc23d1 | 14262:baff095b146c |
---|---|
44 }; | 44 }; |
45 | 45 |
46 typedef struct _JabberSIXfer { | 46 typedef struct _JabberSIXfer { |
47 JabberStream *js; | 47 JabberStream *js; |
48 | 48 |
49 GaimProxyConnectInfo *connect_info; | 49 GaimProxyConnectData *connect_data; |
50 | 50 |
51 gboolean accepted; | 51 gboolean accepted; |
52 | 52 |
53 char *stream_id; | 53 char *stream_id; |
54 char *iq_id; | 54 char *iq_id; |
98 JabberIq *iq; | 98 JabberIq *iq; |
99 xmlnode *query, *su; | 99 xmlnode *query, *su; |
100 struct bytestreams_streamhost *streamhost = jsx->streamhosts->data; | 100 struct bytestreams_streamhost *streamhost = jsx->streamhosts->data; |
101 | 101 |
102 gaim_proxy_info_destroy(jsx->gpi); | 102 gaim_proxy_info_destroy(jsx->gpi); |
103 jsx->connect_info = NULL; | 103 jsx->connect_data = NULL; |
104 | 104 |
105 if(source < 0) { | 105 if(source < 0) { |
106 jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost); | 106 jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost); |
107 g_free(streamhost->jid); | 107 g_free(streamhost->jid); |
108 g_free(streamhost->host); | 108 g_free(streamhost->host); |
169 dstaddr = g_malloc(41); | 169 dstaddr = g_malloc(41); |
170 p = dstaddr; | 170 p = dstaddr; |
171 for(i=0; i<20; i++, p+=2) | 171 for(i=0; i<20; i++, p+=2) |
172 snprintf(p, 3, "%02x", hashval[i]); | 172 snprintf(p, 3, "%02x", hashval[i]); |
173 | 173 |
174 jsx->connect_info = gaim_proxy_connect_socks5(jsx->gpi, dstaddr, 0, | 174 jsx->connect_data = gaim_proxy_connect_socks5(jsx->gpi, dstaddr, 0, |
175 jabber_si_bytestreams_connect_cb, xfer); | 175 jabber_si_bytestreams_connect_cb, xfer); |
176 g_free(dstaddr); | 176 g_free(dstaddr); |
177 | 177 |
178 if (jsx->connect_info == NULL) | 178 if (jsx->connect_data == NULL) |
179 { | 179 { |
180 jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost); | 180 jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost); |
181 g_free(streamhost->jid); | 181 g_free(streamhost->jid); |
182 g_free(streamhost->host); | 182 g_free(streamhost->host); |
183 g_free(streamhost); | 183 g_free(streamhost); |
694 JabberSIXfer *jsx = xfer->data; | 694 JabberSIXfer *jsx = xfer->data; |
695 JabberStream *js = jsx->js; | 695 JabberStream *js = jsx->js; |
696 | 696 |
697 js->file_transfers = g_list_remove(js->file_transfers, xfer); | 697 js->file_transfers = g_list_remove(js->file_transfers, xfer); |
698 | 698 |
699 if (jsx->connect_info != NULL) | 699 if (jsx->connect_data != NULL) |
700 gaim_proxy_connect_cancel(jsx->connect_info); | 700 gaim_proxy_connect_cancel(jsx->connect_data); |
701 | 701 |
702 g_free(jsx->stream_id); | 702 g_free(jsx->stream_id); |
703 g_free(jsx->iq_id); | 703 g_free(jsx->iq_id); |
704 /* XXX: free other stuff */ | 704 /* XXX: free other stuff */ |
705 g_free(jsx->rxqueue); | 705 g_free(jsx->rxqueue); |