get rid of duplicate address code, and display the tracker announce/scrape correctly

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 714cfb3433604e2bd9fa4de8c819f9d5a28707b5..e8905c59522b68fd212bb330c630752af734ed88 100644 (file)
--- 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 3874e56b8ac540f95232f2dd7099b8a535768e3f..a3732872531692c3d6c97829021a59744ec329e8 100644 (file)
--- 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 ef3fe052ca453f35303b52ed4e39ec4355d43b36..23de83b2276b253945d95aa63eff759018e62dfe 100644 (file)
--- 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];