Changeset 23345

Timestamp:

05/08/2008 12:57:05 AM (7 months ago)

Author:

evands

Message:

When an object's address book preferences change, don't let its preferences become those of the global plugin. This fixes loss of AB data after changing a per-contact address book setting such as associating a contact with an address book card. Fixes #9303. Also, don't set the phonetic name if it's the same as the display name when adding to the address book.

Files:

• trunk/Source/ESAddressBookIntegrationPlugin.m (modified) (3 diffs)

trunk/Source/ESAddressBookIntegrationPlugin.m

@@ -477 +477 @@
-                                                        object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime
-{
+        if (object) return;
+
-    if ([group isEqualToString:PREF_GROUP_ADDRESSBOOK]) {
-                BOOL                    oldCreateMetaContacts = createMetaContacts;
@@ -1123 +1125 @@
-                        
-                        dict = [addressBookDict objectForKey:serviceID];
-                        
-                        keysEnumerator = [[dict allKeysForObject:uniqueID] objectEnumerator];
-                        
@@ -1181 +1182 @@
-                //Set the name
-                [person setValue:[contact displayName] forKey:kABFirstNameProperty];
-
-
+
+
+
-                NSString                                *UID = [contact formattedUID];
-