Changeset 23535

Timestamp:

05/21/2008 07:11:19 AM (6 months ago)

Author:

evands

Message:

If only one account is online of a given service type, it should be checked when the Add Contact window opens regardless of whether it was checked previously. Fixes #9871

Files:

• trunk/Source/AINewContactWindowController.m (modified) (1 diff)

trunk/Source/AINewContactWindowController.m

@@ -508 +508 @@
-        checkedAccounts = [[NSMutableSet alloc] init];
-
-        //Select accounts by default
-        if (initialAccount && [accounts containsObject:initialAccount]) {
+                //Select accounts by default
-                [checkedAccounts addObject:initialAccount];
-
+        } else if ([[accounts valueForKeyPath:@"@sum.online"] intValue] == 1) {
+                //Only one online account; it should be checked
+                NSEnumerator    *enumerator;
+                AIAccount               *anAccount;
+                
+                enumerator = [accounts objectEnumerator];
+                while ((anAccount = [enumerator nextObject])) {
+                        if ([anAccount online]) {
+                                [checkedAccounts addObject:anAccount];
+                                break;
+                        }
+                }
+                
-        } else {
+                //More than one online account; follow our 'add contact to' preferences
-                NSEnumerator    *enumerator;
-                AIAccount               *anAccount;