Adium

Changeset 25634

Show
Ignore:
Timestamp:
11/29/2008 10:51:17 AM (3 days ago)
Author:
evands
Message:

'self' in a class method isn't the same as 'self' in the singleton; we were registering the singleton instance as a list object observer and then attempting to unregister the class (which of course did nothing). Fixes #10937

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Frameworks/Adium Framework/Source/AIAddressBookController.m

    r25494 r25634  
    178178+ (void) stopAddressBookIntegration 
    179179{ 
    180         [[AIContactObserverManager sharedManager] unregisterListObjectObserver:self]; 
    181         [adium.notificationCenter removeObserver:self]; 
    182         [addressBookController release]; 
     180        [[AIContactObserverManager sharedManager] unregisterListObjectObserver:addressBookController]; 
     181        [adium.preferenceController unregisterPreferenceObserver:addressBookController]; 
     182        [adium.notificationCenter removeObserver:addressBookController]; 
     183 
     184        [addressBookController release]; addressBookController = nil; 
    183185} 
    184186 
    …… 
    189191        [sharedAddressBook release]; sharedAddressBook = nil; 
    190192        [personUniqueIdToMetaContactDict release]; personUniqueIdToMetaContactDict = nil; 
    191          
     193 
     194        [[AIContactObserverManager sharedManager] unregisterListObjectObserver:self]; 
    192195        [adium.preferenceController unregisterPreferenceObserver:self]; 
    193196        [adium.notificationCenter removeObserver:self];