[Gaim-commits] SF.net SVN: gaim: [16479] branches/v2_0_0/src/protocols/jabber/jabber.c

[<sea...@us...>]

Revision: 16479
Author:   seanegan
Date:     2006-07-10 11:12:11 -0700 (Mon, 10 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16479&view=rev

Log Message:
-----------
Backport from 2.0.0

Modified Paths:
--------------
    branches/v2_0_0/src/protocols/jabber/jabber.c
Modified: branches/v2_0_0/src/protocols/jabber/jabber.c
===================================================================
--- branches/v2_0_0/src/protocols/jabber/jabber.c	2006-07-10 18:08:11 UTC (rev 16478)
+++ branches/v2_0_0/src/protocols/jabber/jabber.c	2006-07-10 18:12:11 UTC (rev 16479)
@@ -919,15 +919,12 @@
 {
 	JabberStream *js = gc->proto_data;
 
-/* This is for Adium.  Gaim never uses OpenSSL, because of licensing issues,
- * and our configure doesn't check for it. -- rlaager */
-#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
+	/* Don't perform any actions on the ssl connection
+	 * if we were forcibly disconnected because it will crash
+	 * on some SSL backends.
 	 */
 	if (!gc->disconnect_timeout)
-#endif
-	jabber_send_raw(js, "</stream:stream>", -1);
+		jabber_send_raw(js, "</stream:stream>", -1);
 
 	if(js->gsc) {
 #ifdef HAVE_OPENSSL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.