Changeset 5327

Show
Ignore:
Timestamp:
02/28/08 16:21:45 (4 months ago)
Author:
morris
Message:

Fix problems with writing over bookmarks when deleting them

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • WiredClient/trunk/WCPreferences.m

    r5168 r5327  
    739739        row = [_trackerBookmarksTableView selectedRow]; 
    740740         
    741         if(row >= 0) { 
     741        if(row >= 0 && (NSUInteger) row < [[WCSettings objectForKey:WCTrackerBookmarks] count]) { 
    742742                trackerBookmark = [WCSettings trackerBookmarkAtIndex:row]; 
    743743                 
    …… 
    764764        row = [_trackerBookmarksTableView selectedRow]; 
    765765         
    766         if(row < 0) 
     766        if(row < 0 || (NSUInteger) row >= [[WCSettings objectForKey:WCTrackerBookmarks] count]) 
    767767                return; 
    768768         
    …… 
    12191219 
    12201220 
    1221 - (void)downloadFolderPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(int)returnCode contextInfo:(void *)contextInfo { 
     1221- (void)downloadFolderPanelDidEnd:(NSOpenPanel *)openPanel returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { 
    12221222        if(returnCode == NSOKButton) { 
    12231223                [_downloadFolderTextField setStringValue:[[openPanel filename] stringByAbbreviatingWithTildeInPath]]; 
    …… 
    12801280 
    12811281 
    1282 - (void)deleteBookmarkSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { 
     1282- (void)deleteBookmarkSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { 
    12831283        NSInteger       row; 
    12841284 
    …… 
    12921292                [WCSettings removeBookmarkAtIndex:row]; 
    12931293                [_bookmarksTableView reloadData]; 
     1294                [self _selectBookmark]; 
    12941295                 
    12951296                [[NSNotificationCenter defaultCenter] postNotificationName:WCBookmarksDidChange object:self]; 
    …… 
    13411342 
    13421343 
    1343 - (void)deleteHighlightSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { 
     1344- (void)deleteHighlightSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { 
    13441345        NSInteger       row; 
    13451346 
    …… 
    13931394 
    13941395 
    1395 - (void)deleteIgnoreSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { 
     1396- (void)deleteIgnoreSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { 
    13961397        NSInteger       row; 
    13971398 
    …… 
    14521453 
    14531454 
    1454 - (void)deleteTrackerBookmarkSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(void *)contextInfo { 
     1455- (void)deleteTrackerBookmarkSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { 
    14551456        NSInteger       row; 
    14561457 
    …… 
    14631464                [WCSettings removeTrackerBookmarkAtIndex:row]; 
    14641465                [_trackerBookmarksTableView reloadData]; 
    1465                  
    1466                 row = row == 0 ? 0 : row - 1; 
    1467                  
    1468                 if(row != [_trackerBookmarksTableView selectedRow]) 
    1469                         [_trackerBookmarksTableView selectRow:row byExtendingSelection:NO]; 
    1470                 else 
    1471                         [self _selectTrackerBookmark]; 
     1466                [self _selectTrackerBookmark]; 
    14721467 
    14731468                [[NSNotificationCenter defaultCenter] postNotificationName:WCTrackerBookmarksDidChange object:self];