Mercurial > pidgin

diff libgaim/protocols/irc/irc.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 4975f529d909
children 34de373e45c1
line wrap: on
line diff
--- a/libgaim/protocols/irc/irc.c	Mon Aug 21 05:07:42 2006 +0000
+++ b/libgaim/protocols/irc/irc.c	Mon Aug 21 05:25:44 2006 +0000
@@ -324,11 +324,11 @@
 
 	if (!irc->gsc) {
 
-		irc->connect_info = gaim_proxy_connect(account, irc->server,
+		irc->connect_data = gaim_proxy_connect(account, irc->server,
 				 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT),
 				 irc_login_cb, gc);
 
-		if (!irc->connect_info || !gaim_account_get_connection(account)) {
+		if (!irc->connect_data || !gaim_account_get_connection(account)) {
 			gaim_connection_error(gc, _("Couldn't create socket"));
 			return;
 		}
@@ -390,7 +390,7 @@
 	GaimConnection *gc = data;
 	struct irc_conn *irc = gc->proto_data;
 
-	irc->connect_info = NULL;
+	irc->connect_data = NULL;
 
 	if (source < 0) {
 		gaim_connection_error(gc, _("Couldn't connect to host"));
@@ -433,8 +433,8 @@
 	if (irc->gsc || (irc->fd >= 0))
 		irc_cmd_quit(irc, "quit", NULL, NULL);
 
-	if (irc->connect_info)
-		gaim_proxy_connect_cancel(irc->connect_info);
+	if (irc->connect_data)
+		gaim_proxy_connect_cancel(irc->connect_data);
 
 	if (gc->inpa)
 		gaim_input_remove(gc->inpa);