adium/adium

a752b22eb698
Parents af3dbe7e7d32
Children 11ff56343911
Switch to the new preference for client_login, remove dependency on proxy.
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m Thu Mar 23 16:14:19 2017 -0400
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m Thu Mar 23 22:20:36 2017 +0100
@@ -97,8 +97,7 @@
purple_account_set_bool(account, "allow_multiple_logins", [[self preferenceForKey:PREFERENCE_ALLOW_MULTIPLE_LOGINS
group:GROUP_ACCOUNT_STATUS] boolValue]);
- //Always yes, so SSL on ICQ works again. Note that we'll disable it if we're using a proxy server.
- purple_account_set_bool(account, "use_clientlogin", TRUE);
+ purple_account_set_string(account, "login_type", "client_login");
if ([[self preferenceForKey:PREFERENCE_ENCRYPTION_TYPE group:GROUP_ACCOUNT_STATUS] isEqualToString:PREFERENCE_ENCRYPTION_TYPE_OPPORTUNISTIC]) {
purple_account_set_string(account, "encryption", "opportunistic_encryption");
@@ -108,21 +107,6 @@
purple_account_set_string(account, "encryption", "no_encryption");
}
}
-
-- (void)continueConnectWithConfiguredProxy
-{
- PurpleProxyInfo *proxy_info = purple_account_get_proxy_info(account);
-
- if ((purple_proxy_info_get_type(proxy_info) != PURPLE_PROXY_NONE) &&
- purple_proxy_info_get_host(proxy_info) && strlen(purple_proxy_info_get_host(proxy_info))) {
- /* Proxy servers and client login don't currently get along. This should be fixed in libpurple, but until then,
- * just don't use it, unless the hidden preference is set.
- */
- purple_account_set_bool(account, "use_clientlogin", [[NSUserDefaults standardUserDefaults] boolForKey:@"AIUseClientLoginWithProxies"]);
- }
-
- [super continueConnectWithConfiguredProxy];
-}
- (void)migrateSSL
{