From bc0f2bb3f0b6d7764d0279d0d42cdc3eca0f7014 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Sun, 31 Jan 2010 21:25:49 +0000 Subject: [PATCH] remove a few 1.8 -> 1.9 warnings --- macosx/InfoWindowController.m | 10 ---------- macosx/TrackerNode.m | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 06bdacb8c..abde4285e 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -1263,11 +1263,6 @@ typedef enum [fRevealDataButton setHidden: YES]; - #warning remove after 1.8 - [fHashField setSelectable: NO]; - [fCreatorField setSelectable: NO]; - [fDataLocationField setSelectable: NO]; - [fStateField setStringValue: @""]; [fProgressField setStringValue: @""]; @@ -1368,11 +1363,6 @@ typedef enum [fDateAddedField setObjectValue: [torrent dateAdded]]; - #warning remove after 1.8 - [fHashField setSelectable: YES]; - [fCommentView setSelectable: ![commentString isEqualToString: @""]]; - [fDataLocationField setSelectable: YES]; - //set pieces view BOOL piecesAvailableSegment = [[NSUserDefaults standardUserDefaults] boolForKey: @"PiecesViewShowAvailability"]; [fPiecesControl setSelected: piecesAvailableSegment forSegment: PIECES_CONTROL_AVAILABLE]; diff --git a/macosx/TrackerNode.m b/macosx/TrackerNode.m index f21dc761b..99f9b8bb2 100644 --- a/macosx/TrackerNode.m +++ b/macosx/TrackerNode.m @@ -118,9 +118,8 @@ baseString = [NSLocalizedString(@"Last Announce", "Tracker last announce") stringByAppendingFormat: @": %@", dateString]; if (fStat.hasAnnounced && fStat.lastAnnounceSucceeded) { - #warning after 1.8 fix ugly hack NSString * peerString; - if (fStat.lastAnnouncePeerCount == 1 && [[[NSLocale currentLocale] localeIdentifier] hasPrefix: @"en_"]) + if (fStat.lastAnnouncePeerCount == 1) peerString = NSLocalizedString(@"got 1 peer", "Tracker last announce"); else peerString = [NSString stringWithFormat: NSLocalizedString(@"got %d peers", "Tracker last announce"),