adium-1.4 3567:a8e4da84a3ce: I keep forgetting UID doesn't mean ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/a8e4da84a3ce
revision:	3567:a8e4da84a3ce
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.

diffs (30 lines):

diff -r 84fb6840e22c -r a8e4da84a3ce 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
@@ -327,7 +327,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) {
@@ -335,7 +335,7 @@
 			}
 			
 			[previousStatus setObject:currentStatusState
-							   forKey:[account UID]];
+							   forKey:[account internalObjectID]];
  		}
 		
 		AILogWithSignature(@"Setting %@ to status %@", account, targetStatusState);
@@ -365,7 +365,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) {