adium 5419:37fb8f8a23c8: Merged adium-1.5.7 into adium-1.6.

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/37fb8f8a23c8
revision:	5419:37fb8f8a23c8
branch:		adium-1.6
author:		Thijs Alkemade <me at thijsalkema.de>
date:		Tue Apr 16 17:05:41 2013 +0200

Merged adium-1.5.7 into adium-1.6.

diffs (76 lines):

diff -r ca83a87cff60 -r 37fb8f8a23c8 AdiumHelp/pgs/Accounts-Sametime.html
--- a/AdiumHelp/pgs/Accounts-Sametime.html	Sat Mar 23 23:00:38 2013 -0400
+++ b/AdiumHelp/pgs/Accounts-Sametime.html	Tue Apr 16 17:05:41 2013 +0200
@@ -46,7 +46,8 @@
 			</table>
 			<p>IBM Lotus Sametime is a messaging protocol used primarily in corporate environments.
 			<p>Adium's Sametime support is provided via the <a class="ext_link" href="http://meanwhile.sf.net/">Meanwhile</a> library and Pidgin plugin, an open re-implementation of the protocol developed by Christopher (siege) O'Brien. Sametime-specific issues and requests are best directed to the appropriate <a class="ext_link" href="http://sf.net/tracker/?group_id=110565</a>">Meanwhile project trackers</a>. Questions regarding the Meanwhile library and Pidgin plugin may be answered on the <a class="ext_link" href="http://meanwhile.sourceforge.net/faq/">Meanwhile FAQ</a> page.
-			<p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, in Adium 1.0 or later, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
+			<p><strong>Technical note</strong>: The Meanwhile library's client ID is 0x1700. If you can connect with the official Lotus client but receive a "Not Authorized" error when connecting with Adium, you may need to ask your IT department to enable access for the Meanwhile client ID. Alternately, select "Hide client identity" in the Options of tab of your Sametime account's preferences within Adium.</p>
+			<p><a class="ext_link" href="http://www.nomaen.com/2012/01/connecting-with-ibmers-via-sametime-in.html">This blog post</a> has instructions on how to setup Sametime as an IBM employee.</p>
 		</div>
 	</div>
 	<div class="taskboxline">
diff -r ca83a87cff60 -r 37fb8f8a23c8 ChangeLogs/Changes.txt
--- a/ChangeLogs/Changes.txt	Sat Mar 23 23:00:38 2013 -0400
+++ b/ChangeLogs/Changes.txt	Tue Apr 16 17:05:41 2013 +0200
@@ -57,8 +57,10 @@
 - Fixed DNS leaks in libpurple. / Added a "Tor (SOCKS5)" proxy option, which uses the Tor proxy option of libpurple. (#15161)
 - "Proxy bypass when registered jabber handle" (#15957)
 
+Version 1.5.7 (XX/XX/20XX)
+ * Fix a bug that could cause SSL connections to be closed prematurely. (#16356)
 
-Version 1.5.6 (3/XX/2013)
+Version 1.5.6 (3/18/2013)
  * Fix a crash on startup on 10.6.8.
  * Fix a crash when accepting or canceling the certificate verification dialog. (#16280)
  * Fix a crash or hang when trying to use OTR on 32-bits Macs. (#16203)
diff -r ca83a87cff60 -r 37fb8f8a23c8 Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m
--- a/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Sat Mar 23 23:00:38 2013 -0400
+++ b/Plugins/Purple Service/AIPurpleCertificateTrustWarningAlert.m	Tue Apr 16 17:05:41 2013 +0200
@@ -97,7 +97,10 @@
 
 - (void)dealloc {
 	CFRelease(certificates);
+	CFRelease(trustRef);
+	
 	[hostname release];
+	
 	[super dealloc];
 }
 
@@ -309,8 +312,6 @@
 	}
 
 	[trustpanel release];
-	CFRelease(trustRef);
-	trustRef = NULL;
 
 	[parentWindow performClose:nil];
 	
diff -r ca83a87cff60 -r 37fb8f8a23c8 Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Sat Mar 23 23:00:38 2013 -0400
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c	Tue Apr 16 17:05:41 2013 +0200
@@ -230,17 +230,18 @@
             switch(theErr) {
                 case ENOENT:
                     /* connection closed */
-                    rtn = errSSLClosedGraceful; 
+                    rtn = errSSLClosedGraceful;
                     break;
                 case ECONNRESET:
                     rtn = errSSLClosedAbort;
                     break;
+				case 0:
                 case EAGAIN:
                     rtn = errSSLWouldBlock;
                     break;
                 default:
-                    fprintf(stderr,"SocketRead: read(%lu) error %d\n", 
-                             (unsigned long)bytesToGo, theErr);
+                    fprintf(stderr,"SocketRead: read(%lu) error %d\n",
+							(unsigned long)bytesToGo, theErr);
                     rtn = errSSLFatalAlert;
                     break;
             }