adium 3533:b523831e2f3d: Show a message if ICQ SSL is disabled. ...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/b523831e2f3d
revision:	3533:b523831e2f3d
author:		Evan Schoenberg
date:		Mon Nov 15 19:03:41 2010 -0600

Show a message if ICQ SSL is disabled. This will only end up being shown on a tiny number of systems (as SSL support is new in 1.4 and is off by default for ICQ accounts); it does break string freeze. Sorry.
(transplanted from 70f3abaf9ae6a41576d9639474f4db8a98a41f55)
Subject: adium 3534:7f59e9267142: Wordage tweak

details:	http://hg.adium.im/adium/rev/7f59e9267142
revision:	3534:7f59e9267142
author:		Evan Schoenberg
date:		Mon Nov 15 19:06:03 2010 -0600

Wordage tweak
(transplanted from 03c323803ca0c66b341ebd0e5bad83ed3eb4092e)

diffs (28 lines):

diff -r 9a398860e182 -r 7f59e9267142 Plugins/Purple Service/ESPurpleICQAccount.m
--- a/Plugins/Purple Service/ESPurpleICQAccount.m	Mon Nov 15 18:39:03 2010 -0600
+++ b/Plugins/Purple Service/ESPurpleICQAccount.m	Mon Nov 15 19:06:03 2010 -0600
@@ -31,7 +31,7 @@
 {
 	if (([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"login.oscar.aol.com"] == NSOrderedSame) ||
 		([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"slogin.oscar.aol.com"] == NSOrderedSame) ||
-		([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"slogin.icq.com"] == NSOrderedSame) {
+		([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"slogin.icq.com"] == NSOrderedSame)) {
 		/* Reset to the default if we're set to the old AOL login server or its ssl variant.
 		 * Reset to the default if we're set to use the ICQ SSL server, as it's currently broken. */
 		[self setPreference:nil
@@ -60,6 +60,15 @@
 	purple_account_set_bool(account, "web_aware", [[self preferenceForKey:KEY_ICQ_WEB_AWARE group:GROUP_ACCOUNT_STATUS] boolValue]);
 
 #warning Remove when ICQ SSL support is fixed
+	if ([[self preferenceForKey:PREFERENCE_SSL_CONNECTION
+						  group:GROUP_ACCOUNT_STATUS] boolValue]) {
+		NSRunCriticalAlertPanel(@"Secure connection to ICQ disabled",
+								@"Due to recent change with the ICQ service, SSL connections to ICQ are not currently supported. SSL has automatically been disabled.",
+								nil, nil, nil);
+		[self setPreference:nil
+					 forKey:PREFERENCE_SSL_CONNECTION
+					  group:GROUP_ACCOUNT_STATUS];
+	}
 	purple_account_set_bool(account, "use_ssl", NO);
 }