adium-1.4 3262:70f3abaf9ae6: Show a message if ICQ SSL is disabl...
commits at adium.im
commits at adium.im
Tue Nov 16 01:03:46 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/70f3abaf9ae6
revision: 3262:70f3abaf9ae6
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.
diffs (28 lines):
diff -r ce0971e07ac6 -r 70f3abaf9ae6 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:03:41 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 server changes, SSL connections to ICQ are not yet 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);
}
More information about the commits
mailing list