adium-1.4 3261:ce0971e07ac6: Disable connecting via SSL to ICQ

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/ce0971e07ac6
revision:	3261:ce0971e07ac6
author:		Evan Schoenberg
date:		Mon Nov 15 18:39:03 2010 -0600

Disable connecting via SSL to ICQ

diffs (52 lines):

diff -r 31875851266b -r ce0971e07ac6 Plugins/Purple Service/ESPurpleICQAccount.m
--- a/Plugins/Purple Service/ESPurpleICQAccount.m	Mon Nov 15 18:34:01 2010 -0600
+++ b/Plugins/Purple Service/ESPurpleICQAccount.m	Mon Nov 15 18:39:03 2010 -0600
@@ -29,8 +29,11 @@
 
 - (void)initAccount
 {
-	if ([[self preferenceForKey:KEY_CONNECT_HOST group:GROUP_ACCOUNT_STATUS] caseInsensitiveCompare:@"login.oscar.aol.com"] == NSOrderedSame) {
-		/* Reset to the default if we're set to the old AOL login server */
+	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) {
+		/* 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
 					 forKey:KEY_CONNECT_HOST
 					  group:GROUP_ACCOUNT_STATUS];
@@ -55,8 +58,12 @@
 	
 	//Defaults to NO - web_aware will cause lots of spam for many users!
 	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
+	purple_account_set_bool(account, "use_ssl", NO);
 }
 
+
 #pragma mark Contact updates
 
 - (const char *)purpleStatusIDForStatus:(AIStatus *)statusState
diff -r 31875851266b -r ce0971e07ac6 Plugins/Purple Service/ESPurpleICQAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleICQAccountViewController.m	Mon Nov 15 18:34:01 2010 -0600
+++ b/Plugins/Purple Service/ESPurpleICQAccountViewController.m	Mon Nov 15 18:39:03 2010 -0600
@@ -32,6 +32,7 @@
 	[popUp_encoding setMenu:[self encodingMenu]];
 }
 
+
 //Configure controls
 - (void)configureForAccount:(AIAccount *)inAccount
 {
@@ -40,6 +41,10 @@
 																		group:GROUP_ACCOUNT_STATUS]];
 	[checkBox_webAware setState:[[account preferenceForKey:KEY_ICQ_WEB_AWARE
 													 group:GROUP_ACCOUNT_STATUS] boolValue]];
+
+#warning Remove when ICQ SSL support is fixed
+	[checkBox_SSL setState:NO];
+	[checkBox_SSL setEnabled:NO];
 }
 
 //Save controls