adium 3537:865132b79f23: If Use Old SSL is enabled, we must use ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/865132b79f23
revision:	3537:865132b79f23
author:		Evan Schoenberg
date:		Mon Nov 15 20:37:31 2010 -0600

If Use Old SSL is enabled, we must use the 'old_ssl' preference. Previously, if both it and 'require SSL/TSL' were enabled, we ignored the old_ssl preference entirely as of 1.4.1b1. Fixes #14558
(transplanted from d9f08899c5a5b173bae6bc5bc37ff113cb9c6389)

diffs (17 lines):

diff -r 43332e397ff6 -r 865132b79f23 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m	Mon Nov 15 20:08:46 2010 -0600
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m	Mon Nov 15 20:37:31 2010 -0600
@@ -162,10 +162,10 @@
 	forceOldSSL = [[self preferenceForKey:KEY_JABBER_FORCE_OLD_SSL group:GROUP_ACCOUNT_STATUS] boolValue];
 	requireTLS = [[self preferenceForKey:KEY_JABBER_REQUIRE_TLS group:GROUP_ACCOUNT_STATUS] boolValue];
 	
-	if (requireTLS)
+	if (forceOldSSL)
+		connectionSecurity = "old_ssl";
+	else if (requireTLS)
 		connectionSecurity = "require_tls";
-	else if (forceOldSSL)
-		connectionSecurity = "old_ssl";
 	else 
 		connectionSecurity = "opportunistic_tls";