comparison src/protocols/jabber/jabber.c @ 13384:a580ffe73314

[gaim-migrate @ 15757] jabber updates, including the first half of JEP-0115 support, and maybe the fix for jabber plaintext messages not having their line-endings preserved committer: Tailor Script <[e-mail]>

13383:07286677b8b8

#ifdef HAVE_OPENSSL
	/* If using OpenSSL, don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash. -- evands
	 */
	if (!gc->disconnect_timeout)
		jabber_send_raw(js, "</stream:stream>", -1);
#else
	jabber_send_raw(js, "</stream:stream>", -1);
#endif

	if(js->gsc) {
#ifdef HAVE_OPENSSL
		if (!gc->disconnect_timeout)
			gaim_ssl_close(js->gsc);
#else
		gaim_ssl_close(js->gsc);		
#endif
	} else if (js->fd > 0) {
		if(js->gc->inpa)
			gaim_input_remove(js->gc->inpa);
		close(js->fd);
	}

13384:a580ffe73314

#ifdef HAVE_OPENSSL
	/* If using OpenSSL, don't perform any actions on the ssl connection
	 * if we were forcibly disconnected because it will crash. -- evands
	 */
	if (!gc->disconnect_timeout)
#endif
	jabber_send_raw(js, "</stream:stream>", -1);

	if(js->gsc) {
#ifdef HAVE_OPENSSL
		if (!gc->disconnect_timeout)
#endif
			gaim_ssl_close(js->gsc);
	} else if (js->fd > 0) {
		if(js->gc->inpa)
			gaim_input_remove(js->gc->inpa);
		close(js->fd);
	}