Changeset 9207


Ignore:
Timestamp:
Sep 28, 2009, 1:53:17 PM (13 years ago)
Author:
livings124
Message:

on 10.5 don't even acknowledge the NSCache object

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/macosx/TrackerCell.m

    r9205 r9207  
    128128    //name
    129129    NSAttributedString * nameString = [self attributedNameWithColor: nameColor];
    130     NSRect nameRect = [self rectForNameWithString: nameString inBounds: cellFrame];
     130    const NSRect nameRect = [self rectForNameWithString: nameString inBounds: cellFrame];
    131131    [nameString drawInRect: nameRect];
    132132   
     
    135135   
    136136    NSAttributedString * lastAnnounceString = [self attributedStatusWithString: [node lastAnnounceStatusString] color: statusColor];
    137     NSRect lastAnnounceRect = [self rectForStatusWithString: lastAnnounceString withAboveRect: nameRect inBounds: cellFrame];
     137    const NSRect lastAnnounceRect = [self rectForStatusWithString: lastAnnounceString withAboveRect: nameRect inBounds: cellFrame];
    138138    [lastAnnounceString drawInRect: lastAnnounceRect];
    139139   
    140140    NSAttributedString * nextAnnounceString = [self attributedStatusWithString: [node nextAnnounceStatusString] color: statusColor];
    141     NSRect nextAnnounceRect = [self rectForStatusWithString: nextAnnounceString withAboveRect: lastAnnounceRect inBounds: cellFrame];
     141    const NSRect nextAnnounceRect = [self rectForStatusWithString: nextAnnounceString withAboveRect: lastAnnounceRect
     142                                        inBounds: cellFrame];
    142143    [nextAnnounceString drawInRect: nextAnnounceRect];
    143144   
    144145    NSAttributedString * lastScrapeString = [self attributedStatusWithString: [node lastScrapeStatusString] color: statusColor];
    145     NSRect lastScrapeRect = [self rectForStatusWithString: lastScrapeString withAboveRect: nextAnnounceRect inBounds: cellFrame];
     146    const NSRect lastScrapeRect = [self rectForStatusWithString: lastScrapeString withAboveRect: nextAnnounceRect inBounds: cellFrame];
    146147    [lastScrapeString drawInRect: lastScrapeRect];
    147148}
     
    188189    if (icon)
    189190    {
    190         [fTrackerIconCache setObject: icon forKey: baseAddress];
    191         [fTrackerIconCacheLeopard setObject: icon forKey: baseAddress];
     191        [NSApp isOnSnowLeopardOrBetter] ? [fTrackerIconCache setObject: icon forKey: baseAddress];
     192                                        : [fTrackerIconCacheLeopard setObject: icon forKey: baseAddress];
    192193        [icon release];
    193194    }
    194195    else
    195196    {
    196         [fTrackerIconCache setObject: [NSNull null] forKey: baseAddress];
    197         [fTrackerIconCacheLeopard setObject: [NSNull null] forKey: baseAddress];
     197        [NSApp isOnSnowLeopardOrBetter] ? [fTrackerIconCache setObject: [NSNull null] forKey: baseAddress];
     198                                        : [fTrackerIconCacheLeopard setObject: [NSNull null] forKey: baseAddress];
    198199    }
    199200   
Note: See TracChangeset for help on using the changeset viewer.