diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 714cfb343..e8905c595 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -1046,7 +1046,7 @@ typedef enum Torrent * torrent = [fTorrents objectAtIndex: 0]; - [fTrackerField setStringValue: [torrent trackerAddress]]; + [fTrackerField setStringValue: [torrent trackerAddressAnnounce]]; NSString * location = [torrent dataLocation]; [fDataLocationField setStringValue: [location stringByAbbreviatingWithTildeInPath]]; @@ -1129,7 +1129,7 @@ typedef enum Torrent * torrent = [fTorrents objectAtIndex: 0]; //announce fields - NSString * announceAddress = [[torrent trackerAddress] stringByAppendingString: [torrent trackerAddressAnnounce]]; + NSString * announceAddress = [torrent trackerAddressAnnounce]; [fAnnounceAddressField setStringValue: announceAddress]; [fAnnounceAddressField setToolTip: announceAddress]; @@ -1144,10 +1144,9 @@ typedef enum [fAnnounceNextField setStringValue: announceNext > 0 ? [NSString timeString: announceNext showSeconds: YES] : @""]; //scrape fields - NSString * scrapeAddressTail; - if ((scrapeAddressTail = [torrent trackerAddressScrape])) + NSString * scrapeAddress; + if ((scrapeAddress = [torrent trackerAddressScrape])) { - NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: scrapeAddressTail]; [fScrapeAddressField setStringValue: scrapeAddress]; [fScrapeAddressField setToolTip: scrapeAddress]; } diff --git a/macosx/Torrent.h b/macosx/Torrent.h index 3874e56b8..a37328725 100644 --- a/macosx/Torrent.h +++ b/macosx/Torrent.h @@ -139,7 +139,6 @@ typedef enum - (uint64_t) size; - (uint64_t) sizeLeft; -- (NSString *) trackerAddress; - (NSString *) trackerAddressAnnounce; - (NSDate *) lastAnnounceTime; - (int) nextAnnounceTime; diff --git a/macosx/Torrent.m b/macosx/Torrent.m index ef3fe052c..23de83b22 100644 --- a/macosx/Torrent.m +++ b/macosx/Torrent.m @@ -718,12 +718,6 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void * return fStat->leftUntilDone; } -- (NSString *) trackerAddress -{ - return [NSString stringWithUTF8String: fStat->tracker->announce]; -} - -#warning now redundant - (NSString *) trackerAddressAnnounce { return [NSString stringWithUTF8String: fStat->tracker->announce];