Mercurial > pidgin
diff libgaim/protocols/jabber/jabber.c @ 14250:1f963d406bb4
[gaim-migrate @ 16932]
More sslconn improvements
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Aug 2006 02:42:14 +0000 |
| parents | 60b1bc8dbf37 |
| children | baff095b146c |
line wrap: on
line diff
--- a/libgaim/protocols/jabber/jabber.c Mon Aug 21 02:21:51 2006 +0000 +++ b/libgaim/protocols/jabber/jabber.c Mon Aug 21 02:42:14 2006 +0000 @@ -407,13 +407,6 @@ GaimConnection *gc = data; JabberStream *js = gc->proto_data; - if(!g_list_find(gaim_connections_get_all(), gc)) { - gaim_ssl_close(gsc); - return; - } - - js->gsc = gsc; - if(js->state == JABBER_STREAM_CONNECTING) jabber_send_raw(js, "<?xml version='1.0' ?>", -1); jabber_stream_set_state(js, JABBER_STREAM_INITIALIZING); @@ -450,6 +443,8 @@ GaimConnection *gc = data; JabberStream *js = gc->proto_data; + js->gsc = NULL; + switch(error) { case GAIM_SSL_CONNECT_FAILED: gaim_connection_error(gc, _("Connection Failed")); @@ -458,8 +453,6 @@ gaim_connection_error(gc, _("SSL Handshake Failed")); break; } - - js->gsc = NULL; } static void tls_init(JabberStream *js)