comparison libgaim/protocols/oscar/flap_connection.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 80b05108652c
comparison
equal deleted inserted replaced
14261:bb060cdc23d1 14262:baff095b146c
138 * @param conn The connection to close. 138 * @param conn The connection to close.
139 */ 139 */
140 void 140 void
141 flap_connection_close(OscarData *od, FlapConnection *conn) 141 flap_connection_close(OscarData *od, FlapConnection *conn)
142 { 142 {
143 if (conn->connect_info != NULL) 143 if (conn->connect_data != NULL)
144 { 144 {
145 gaim_proxy_connect_cancel(conn->connect_info); 145 gaim_proxy_connect_cancel(conn->connect_data);
146 conn->connect_info = NULL; 146 conn->connect_data = NULL;
147 } 147 }
148 148
149 if (conn->connect_data != NULL) 149 if (conn->connect_data != NULL)
150 { 150 {
151 if (conn->type == SNAC_FAMILY_CHAT) 151 if (conn->type == SNAC_FAMILY_CHAT)
152 { 152 {
153 oscar_chat_destroy(conn->connect_data); 153 oscar_chat_destroy(conn->new_conn_data);
154 conn->connect_data = NULL; 154 conn->connect_data = NULL;
155 } 155 }
156 } 156 }
157 157
158 if (conn->fd != -1) 158 if (conn->fd != -1)