adium 5977:6ab70c326b25: Codesigning notes

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/6ab70c326b25
revision:	5977:6ab70c326b25
branch:		adium-1.5.10.3
author:		Evan D. Schoenberg, M.D. <evan at regularrateandrhythm.com>
date:		Thu Mar 23 17:59:20 2017 -0400

Codesigning notes
Subject: adium 5978:11ff56343911: Automated merge with bundle:/var/folders/fp/kv196wnj33q3zbl59v9x0sr40000gn/T/SourceTreeTemp.TjnVzU

details:	http://hg.adium.im/adium/rev/11ff56343911
revision:	5978:11ff56343911
branch:		adium-1.5.10.3
author:		Evan D. Schoenberg, M.D. <evan at regularrateandrhythm.com>
date:		Thu Mar 23 18:00:04 2017 -0400

Automated merge with bundle:/var/folders/fp/kv196wnj33q3zbl59v9x0sr40000gn/T/SourceTreeTemp.TjnVzU

diffs (42 lines):

diff -r af3dbe7e7d32 -r 11ff56343911 Plugins/Purple Service/CBPurpleOscarAccount.m
--- a/Plugins/Purple Service/CBPurpleOscarAccount.m	Thu Mar 23 16:14:19 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
 {
diff -r af3dbe7e7d32 -r 11ff56343911 Release/Readme-codesigning.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Release/Readme-codesigning.txt	Thu Mar 23 18:00:04 2017 -0400
@@ -0,0 +1,2 @@
+- Codesigning depends upon each framework, Spotlight importer, and executable being individually signed.
+- Frameworks can only be signed if they have no empty folders under Versions. If a dependency is updated, version control can leave an empty folder behind in the local tree, which needs to be removed or code signing will fail. The Makefile tries to remove empty directories, but if that fails consider running hg purge - but take care as this will also undo any other local changes.
\ No newline at end of file