adium-1.4 3448:033e35310245: Fix logging in to ICQ accounts by a...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/033e35310245
revision:	3448:033e35310245
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Mar 24 00:34:09 2011 +0100

Fix logging in to ICQ accounts by always using clientLogin.

Also the "Use SSL" option in the ICQ account is enabled again and will turn on opportunistic_encryption in libpurple. This will use SSL on connections where it is possible, but not fail if it can't.
(transplanted from c86fa741b63487107837394ea606dd150ff32940)
Subject: adium-1.4 3449:62b43027e3a7: Forgot to actually enable the checkbox again.

details:	http://hg.adium.im/adium-1.4/rev/62b43027e3a7
revision:	3449:62b43027e3a7
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Thu Mar 24 00:35:10 2011 +0100

Forgot to actually enable the checkbox again.
(transplanted from b4bbf02d0bc361a5181e0cdd9d7054b4292d4d64)

diffs (54 lines):

diff -r bf9b33ac3a50 -r 62b43027e3a7 Plugins/Purple Service/ESPurpleICQAccount.m
--- a/Plugins/Purple Service/ESPurpleICQAccount.m	Wed Mar 23 13:13:49 2011 +0100
+++ b/Plugins/Purple Service/ESPurpleICQAccount.m	Thu Mar 24 00:35:10 2011 +0100
@@ -59,30 +59,13 @@
 	//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);
-}
-
-- (void)continueConnectWithConfiguredPurpleAccount
-{
-	if ([[self preferenceForKey:PREFERENCE_SSL_CONNECTION
-						  group:GROUP_ACCOUNT_STATUS] boolValue]) {
-		NSInteger ret = NSRunCriticalAlertPanel(@"Secure Connection to ICQ Not Available",
-												 @"Due to recent changes with the ICQ service, SSL connections to ICQ are not currently supported. Do you want to disable SSL and connect without encryption?",
-												 @"Connect Without Encryption",
-												 @"Disable Account",
-												 nil);
-		
-		if (ret == NSAlertDefaultReturn) {
-			[self setPreference:nil
-						 forKey:PREFERENCE_SSL_CONNECTION
-						  group:GROUP_ACCOUNT_STATUS];
-			[super continueConnectWithConfiguredPurpleAccount];
-		} else {
-			[self setEnabled:NO];
-		}
+	// Always yes, so SSL works again.
+	purple_account_set_bool(account, "use_clientlogin", TRUE);
+	
+	if ([[self preferenceForKey:PREFERENCE_SSL_CONNECTION group:GROUP_ACCOUNT_STATUS] boolValue]) {
+		purple_account_set_string(account, "encryption", "opportunistic_encryption");
 	} else {
-		[super continueConnectWithConfiguredPurpleAccount];	
+		purple_account_set_string(account, "encryption", "no_encryption");
 	}
 }
 
diff -r bf9b33ac3a50 -r 62b43027e3a7 Plugins/Purple Service/ESPurpleICQAccountViewController.m
--- a/Plugins/Purple Service/ESPurpleICQAccountViewController.m	Wed Mar 23 13:13:49 2011 +0100
+++ b/Plugins/Purple Service/ESPurpleICQAccountViewController.m	Thu Mar 24 00:35:10 2011 +0100
@@ -41,10 +41,6 @@
 																		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