Mercurial > pidgin
comparison libgaim/protocols/msn/servconn.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 | ddedf15a9420 |
comparison
equal
deleted
inserted
replaced
14261:bb060cdc23d1 | 14262:baff095b146c |
---|---|
169 connect_cb(gpointer data, gint source, const gchar *error_message) | 169 connect_cb(gpointer data, gint source, const gchar *error_message) |
170 { | 170 { |
171 MsnServConn *servconn; | 171 MsnServConn *servconn; |
172 | 172 |
173 servconn = data; | 173 servconn = data; |
174 servconn->connect_info = NULL; | 174 servconn->connect_data = NULL; |
175 servconn->processing = FALSE; | 175 servconn->processing = FALSE; |
176 | 176 |
177 if (servconn->wasted) | 177 if (servconn->wasted) |
178 { | 178 { |
179 msn_servconn_destroy(servconn); | 179 msn_servconn_destroy(servconn); |
231 servconn->connect_cb(servconn); | 231 servconn->connect_cb(servconn); |
232 | 232 |
233 return TRUE; | 233 return TRUE; |
234 } | 234 } |
235 | 235 |
236 servconn->connect_info = gaim_proxy_connect(session->account, host, port, | 236 servconn->connect_data = gaim_proxy_connect(session->account, host, port, |
237 connect_cb, servconn); | 237 connect_cb, servconn); |
238 | 238 |
239 if (servconn->connect_info != NULL) | 239 if (servconn->connect_data != NULL) |
240 { | 240 { |
241 servconn->processing = TRUE; | 241 servconn->processing = TRUE; |
242 return TRUE; | 242 return TRUE; |
243 } | 243 } |
244 else | 244 else |
266 servconn->disconnect_cb(servconn); | 266 servconn->disconnect_cb(servconn); |
267 | 267 |
268 return; | 268 return; |
269 } | 269 } |
270 | 270 |
271 if (servconn->connect_info != NULL) | 271 if (servconn->connect_data != NULL) |
272 { | 272 { |
273 gaim_proxy_connect_cancel(servconn->connect_info); | 273 gaim_proxy_connect_cancel(servconn->connect_data); |
274 servconn->connect_info = NULL; | 274 servconn->connect_data = NULL; |
275 } | 275 } |
276 | 276 |
277 if (servconn->inpa > 0) | 277 if (servconn->inpa > 0) |
278 { | 278 { |
279 gaim_input_remove(servconn->inpa); | 279 gaim_input_remove(servconn->inpa); |