Mercurial > pidgin
changeset 17521:fa1102b7a959
merge of '1751d70d33d84eae410858724f155e6979b38eb0'
and 'dc75156638f936ec9f51f9fc92aa65fa8ed16f4a'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Wed, 06 Jun 2007 02:45:31 +0000 |
| parents | 278e22624ce5 (diff) b2399804c565 (current diff) |
| children | fb096fc27b4e |
| files | |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/plugins/ssl/ssl-nss.c Wed Jun 06 01:52:02 2007 +0000 +++ b/libpurple/plugins/ssl/ssl-nss.c Wed Jun 06 02:45:31 2007 +0000 @@ -311,8 +311,13 @@ if(!nss_data) return; - if (nss_data->in) PR_Close(nss_data->in); - /* if (nss_data->fd) PR_Close(nss_data->fd); */ + if (nss_data->in) { + PR_Close(nss_data->in); + gsc->fd = -1; + } else if (nss_data->fd) { + PR_Close(nss_data->fd); + gsc->fd = -1; + } if (nss_data->handshake_handler) purple_input_remove(nss_data->handshake_handler);