Mercurial > pidgin.yaz

diff libgaim/protocols/jabber/si.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
line wrap: on
line diff
--- a/libgaim/protocols/jabber/si.c	Mon Aug 21 05:07:42 2006 +0000
+++ b/libgaim/protocols/jabber/si.c	Mon Aug 21 05:25:44 2006 +0000
@@ -46,7 +46,7 @@
 typedef struct _JabberSIXfer {
 	JabberStream *js;
 
-	GaimProxyConnectInfo *connect_info;
+	GaimProxyConnectData *connect_data;
 
 	gboolean accepted;
 
@@ -100,7 +100,7 @@
 	struct bytestreams_streamhost *streamhost = jsx->streamhosts->data;
 
 	gaim_proxy_info_destroy(jsx->gpi);
-	jsx->connect_info = NULL;
+	jsx->connect_data = NULL;
 
 	if(source < 0) {
 		jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost);
@@ -171,11 +171,11 @@
 	for(i=0; i<20; i++, p+=2)
 		snprintf(p, 3, "%02x", hashval[i]);
 
-	jsx->connect_info = gaim_proxy_connect_socks5(jsx->gpi, dstaddr, 0,
+	jsx->connect_data = gaim_proxy_connect_socks5(jsx->gpi, dstaddr, 0,
 			jabber_si_bytestreams_connect_cb, xfer);
 	g_free(dstaddr);
 
-	if (jsx->connect_info == NULL)
+	if (jsx->connect_data == NULL)
 	{
 		jsx->streamhosts = g_list_remove(jsx->streamhosts, streamhost);
 		g_free(streamhost->jid);
@@ -696,8 +696,8 @@
 
 	js->file_transfers = g_list_remove(js->file_transfers, xfer);
 
-	if (jsx->connect_info != NULL)
-		gaim_proxy_connect_cancel(jsx->connect_info);
+	if (jsx->connect_data != NULL)
+		gaim_proxy_connect_cancel(jsx->connect_data);
 
 	g_free(jsx->stream_id);
 	g_free(jsx->iq_id);