Mercurial > pidgin.yaz

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 <tailor@pidgin.im>
author Nathan Walp <nwalp@pidgin.im>
date Fri, 03 Mar 2006 03:38:36 +0000
parents 263c2db78f77
children 9ad3d85fffeb
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c	Fri Mar 03 03:00:33 2006 +0000
+++ b/src/protocols/jabber/jabber.c	Fri Mar 03 03:38:36 2006 +0000
@@ -912,18 +912,14 @@
 	 * if we were forcibly disconnected because it will crash. -- evands
 	 */
 	if (!gc->disconnect_timeout)
-		jabber_send_raw(js, "</stream:stream>", -1);
-#else
+#endif
 	jabber_send_raw(js, "</stream:stream>", -1);
-#endif
 
 	if(js->gsc) {
 #ifdef HAVE_OPENSSL
 		if (!gc->disconnect_timeout)
+#endif
 			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);