Mercurial > pidgin.yaz
comparison src/protocols/irc/irc.c @ 14160:c8ebbc0110f4
[gaim-migrate @ 16808]
gaim_ssl_connect's are now cancelable (without crashing, anyway)
This was relatively easy, because the PRPLs already keep a reference
to the GaimSslConnection. I just needed to update the core ssl code
to keep track of the GaimProxyConnectInfo, and to call
gaim_proxy_connect_cancel() when gaim_ssl_close() is called
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 17 Aug 2006 05:47:10 +0000 |
parents | c44af67e2065 |
children |
comparison
equal
deleted
inserted
replaced
14159:ff3db5cdeb9f | 14160:c8ebbc0110f4 |
---|---|
448 gaim_input_remove(gc->inpa); | 448 gaim_input_remove(gc->inpa); |
449 | 449 |
450 g_free(irc->inbuf); | 450 g_free(irc->inbuf); |
451 if (irc->gsc) { | 451 if (irc->gsc) { |
452 gaim_ssl_close(irc->gsc); | 452 gaim_ssl_close(irc->gsc); |
453 } else if (irc->fd > 0) { | 453 } else if (irc->fd >= 0) { |
454 close(irc->fd); | 454 close(irc->fd); |
455 } | 455 } |
456 if (irc->timer) | 456 if (irc->timer) |
457 gaim_timeout_remove(irc->timer); | 457 gaim_timeout_remove(irc->timer); |
458 g_hash_table_destroy(irc->cmds); | 458 g_hash_table_destroy(irc->cmds); |