adium 4044:48c89bf9a350: I keep forgetting UID doesn't mean uniq...

commits at adium.im commits at adium.im
Mon Jul 11 08:26:13 UTC 2011


details:	http://hg.adium.im/adium/rev/48c89bf9a350
revision:	4044:48c89bf9a350
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Mon Jul 11 10:25:11 2011 +0200

I keep forgetting UID doesn't mean unique. Use -internalObjectID instead.
(transplanted from a8e4da84a3ce98b34c8ed02be3c8b2b245f38282)

diffs (30 lines):

diff -r a92441004e19 -r 48c89bf9a350 Source/AIAutomaticStatus.m
--- a/Source/AIAutomaticStatus.m	Mon Jul 11 01:30:53 2011 +0200
+++ b/Source/AIAutomaticStatus.m	Mon Jul 11 10:25:11 2011 +0200
@@ -328,7 +328,7 @@
 		AIStatus	*currentStatusState = account.statusState;
 		
 		// Store the state of the account if there is no previous one saved
-		if (![previousStatus objectForKey:[account UID]]) {
+		if (![previousStatus objectForKey:[account internalObjectID]]) {
 			
 			// Don't modify or store the status of (originally!) non-available accounts
 			if (currentStatusState.statusType != AIAvailableStatusType) {
@@ -336,7 +336,7 @@
 			}
 			
 			[previousStatus setObject:currentStatusState
-							   forKey:[account UID]];
+							   forKey:[account internalObjectID]];
 		}
 		
 		AILogWithSignature(@"Setting %@ to status %@", account, targetStatusState);
@@ -366,7 +366,7 @@
 - (void)returnFromAutoAway
 {
 	for (AIAccount *account in adium.accountController.accounts) {
-		AIStatus *previousStatusState = [previousStatus objectForKey:[account UID]];
+		AIStatus *previousStatusState = [previousStatus objectForKey:[account internalObjectID]];
 		
 		// Skip accounts without stored information.
 		if (!previousStatusState) {




More information about the commits mailing list