Mercurial > pidgin

diff libgaim/protocols/msn/httpconn.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 118fd0dc5b6e
line wrap: on
line diff
--- a/libgaim/protocols/msn/httpconn.c	Mon Aug 21 05:07:42 2006 +0000
+++ b/libgaim/protocols/msn/httpconn.c	Mon Aug 21 05:25:44 2006 +0000
@@ -698,7 +698,7 @@
 	MsnHttpConn *httpconn;
 
 	httpconn = data;
-	httpconn->connect_info = NULL;
+	httpconn->connect_data = NULL;
 	httpconn->fd = source;
 
 	if (source >= 0)
@@ -727,10 +727,10 @@
 	if (httpconn->connected)
 		msn_httpconn_disconnect(httpconn);
 
-	httpconn->connect_info = gaim_proxy_connect(httpconn->session->account,
+	httpconn->connect_data = gaim_proxy_connect(httpconn->session->account,
 		"gateway.messenger.hotmail.com", 80, connect_cb, httpconn);
 
-	if (httpconn->connect_info != NULL)
+	if (httpconn->connect_data != NULL)
 	{
 		httpconn->waiting_response = TRUE;
 		httpconn->connected = TRUE;
@@ -747,10 +747,10 @@
 	if (!httpconn->connected)
 		return;
 
-	if (httpconn->connect_info != NULL)
+	if (httpconn->connect_data != NULL)
 	{
-		gaim_proxy_connect_cancel(httpconn->connect_info);
-		httpconn->connect_info = NULL;
+		gaim_proxy_connect_cancel(httpconn->connect_data);
+		httpconn->connect_data = NULL;
 	}
 
 	if (httpconn->timer)