Adium

Changeset 22373

Show
Ignore:
Timestamp:
01/16/2008 08:26:33 PM (10 months ago)
Author:
evands
Message:

Fixed rejoining of chats to properly reassociate AIChat to PurpleConversation and visa versa. Fixes #1880

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Plugins/Purple Service/CBPurpleAccount.m

    r22272 r22373  
    639639- (BOOL)rejoinChat:(AIChat *)chat 
    640640{ 
    641 //      id identifier = [[chat identifier] retain]; 
     641        [chat retain]; 
     642 
     643        PurpleConversation *conv = [[chat identifier] pointerValue]; 
     644        if (conv && conv->ui_data) { 
     645                [(AIChat *)(conv->ui_data) release]; 
     646                conv->ui_data = NULL; 
     647        } 
    642648 
    643649        /* The identifier is how we associate a PurpleConversation with an AIChat. 
    …… 
    646652        [chat setIdentifier:nil]; 
    647653        [purpleThread openChat:chat onAccount:self]; 
    648 //      [chat setIdentifier:identifier]; 
    649 //     [[chat identifier] release]; 
    650          
    651         //created chat succesfully 
     654 
     655       [chat autorelease]; 
     656 
     657        //We don't get any immediate feedback as to our success; just return YES. 
    652658        return YES; 
    653659}