Automated merge with bundle:/var/folders/fp/kv196wnj33q3zbl59v9x0sr40000gn/T/SourceTreeTemp.TjnVzU adium-1.5.10.3
authorEvan D. Schoenberg, M.D. <evan@regularrateandrhythm.com>
Thu, 23 Mar 2017 18:00:04 -0400
branchadium-1.5.10.3
changeset 5978 11ff56343911
parent 5976 a752b22eb698 (diff)
parent 5977 6ab70c326b25 (current diff)
child 5979 6d760b7b1d69
Automated merge with bundle:/var/folders/fp/kv196wnj33q3zbl59v9x0sr40000gn/T/SourceTreeTemp.TjnVzU
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m	Thu Mar 23 17:59:20 2017 -0400
+++ b/Plugins/Purple Service/CBPurpleOscarAccount.m	Thu Mar 23 18:00:04 2017 -0400
@@ -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
 {