Changeset 4333

Show
Ignore:
Timestamp:
06/17/06 23:25:16 (2 years ago)
Author:
morris
Message:

Always use the name the server gives us

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredClient/trunk/WCConnectionController.h

    r3996 r4333  
    2929@interface WCConnectionController : WIWindowController { 
    3030        NSString                                *_name; 
     31        NSString                                *_identifier; 
    3132        WCServerConnection              *_connection; 
    3233        NSMutableDictionary             *_windowTemplate; 

  • WiredClient/trunk/WCConnectionController.m

    r4273 r4333  
    4747        NSDictionary    *windowTemplate; 
    4848         
    49         windowTemplate = [WCSettings windowTemplateForKey:[[self connection] identifier]]; 
     49        _identifier = [[[self connection] identifier] retain]; 
     50         
     51        windowTemplate = [WCSettings windowTemplateForKey:_identifier]; 
    5052         
    5153        if(!windowTemplate) 
    …… 
    6971                [self windowTemplateShouldSave:_windowTemplate]; 
    7072                 
    71                 windowTemplate = [[WCSettings windowTemplateForKey:[[self connection] identifier]] mutableCopy]; 
     73                windowTemplate = [[WCSettings windowTemplateForKey:_identifier] mutableCopy]; 
    7274                 
    7375                if(!windowTemplate) 
    …… 
    7678                [windowTemplate setObject:_windowTemplate forKey:[self windowNibName]]; 
    7779                 
    78                 [WCSettings setWindowTemplate:windowTemplate forKey:[[self connection] identifier]]; 
     80                [WCSettings setWindowTemplate:windowTemplate forKey:_identifier]; 
    7981                 
    8082                [windowTemplate release]; 
    …… 
    189191- (void)dealloc { 
    190192        [_name release]; 
     193        [_identifier release]; 
    191194 
    192195        [_connection removeObserver:self]; 

  • WiredClient/trunk/WCServerConnection.m

    r4285 r4333  
    6565         
    6666        _server = [[WCServer alloc] init]; 
    67         [_server setName:[bookmark objectForKey:WCBookmarksName]]; 
    6867        [_server setURL:url]; 
    6968         
    …… 
    455454        size            = [fields safeObjectAtIndex:6]; 
    456455 
    457         if(![_server name]) 
    458                 [_server setName:name]; 
    459  
     456        [_server setName:name]; 
    460457        [_server setServerDescription:description]; 
    461458        [_server setServerVersion:version];