Mercurial > pidgin
comparison libgaim/protocols/irc/irc.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 | 4975f529d909 |
children | 34de373e45c1 |
comparison
equal
deleted
inserted
replaced
14261:bb060cdc23d1 | 14262:baff095b146c |
---|---|
322 } | 322 } |
323 } | 323 } |
324 | 324 |
325 if (!irc->gsc) { | 325 if (!irc->gsc) { |
326 | 326 |
327 irc->connect_info = gaim_proxy_connect(account, irc->server, | 327 irc->connect_data = gaim_proxy_connect(account, irc->server, |
328 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), | 328 gaim_account_get_int(account, "port", IRC_DEFAULT_PORT), |
329 irc_login_cb, gc); | 329 irc_login_cb, gc); |
330 | 330 |
331 if (!irc->connect_info || !gaim_account_get_connection(account)) { | 331 if (!irc->connect_data || !gaim_account_get_connection(account)) { |
332 gaim_connection_error(gc, _("Couldn't create socket")); | 332 gaim_connection_error(gc, _("Couldn't create socket")); |
333 return; | 333 return; |
334 } | 334 } |
335 } | 335 } |
336 } | 336 } |
388 static void irc_login_cb(gpointer data, gint source, const gchar *error_message) | 388 static void irc_login_cb(gpointer data, gint source, const gchar *error_message) |
389 { | 389 { |
390 GaimConnection *gc = data; | 390 GaimConnection *gc = data; |
391 struct irc_conn *irc = gc->proto_data; | 391 struct irc_conn *irc = gc->proto_data; |
392 | 392 |
393 irc->connect_info = NULL; | 393 irc->connect_data = NULL; |
394 | 394 |
395 if (source < 0) { | 395 if (source < 0) { |
396 gaim_connection_error(gc, _("Couldn't connect to host")); | 396 gaim_connection_error(gc, _("Couldn't connect to host")); |
397 return; | 397 return; |
398 } | 398 } |
431 return; | 431 return; |
432 | 432 |
433 if (irc->gsc || (irc->fd >= 0)) | 433 if (irc->gsc || (irc->fd >= 0)) |
434 irc_cmd_quit(irc, "quit", NULL, NULL); | 434 irc_cmd_quit(irc, "quit", NULL, NULL); |
435 | 435 |
436 if (irc->connect_info) | 436 if (irc->connect_data) |
437 gaim_proxy_connect_cancel(irc->connect_info); | 437 gaim_proxy_connect_cancel(irc->connect_data); |
438 | 438 |
439 if (gc->inpa) | 439 if (gc->inpa) |
440 gaim_input_remove(gc->inpa); | 440 gaim_input_remove(gc->inpa); |
441 | 441 |
442 g_free(irc->inbuf); | 442 g_free(irc->inbuf); |