From b773c9aebad2b19714f50097c741023e94cad421 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Sun, 30 Mar 2008 04:41:55 +0000
Subject: [PATCH] (trunk) Fix visual glitch with the tracker inspector tab when
 there is no scrape address

---
 NEWS                          |  4 ++++
 macosx/InfoWindowController.m | 15 ++++++++++++---
 macosx/Torrent.m              |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index d0f468c67..39bf7f756 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
 - Mac
    + Display of decimal numbers matches system international settings
 
+1.11 (2008/xx/yy)
+- Mac
+   + Fix visual glitch with the tracker inspector tab when there is no scrape address
+
 1.10 (2008/03/28)
 - All Platforms
    + Stop torrents when downloading and the disk becomes full
diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 14a9b9fd2..f19695c3b 100644
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -1134,9 +1134,18 @@ typedef enum
     [fAnnounceNextField setStringValue: announceNext > 0 ? [NSString timeString: announceNext showSeconds: YES] : @""];
     
     //scrape fields
-    NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: [torrent trackerAddressScrape]];
-    [fScrapeAddressField setStringValue: scrapeAddress];
-    [fScrapeAddressField setToolTip: scrapeAddress];
+    NSString * scrapeAddressTail;
+    if ((scrapeAddressTail = [torrent trackerAddressScrape]))
+    {
+        NSString * scrapeAddress = [[torrent trackerAddress] stringByAppendingString: scrapeAddressTail];
+        [fScrapeAddressField setStringValue: scrapeAddress];
+        [fScrapeAddressField setToolTip: scrapeAddress];
+    }
+    else
+    {
+        [fScrapeAddressField setStringValue: @""];
+        [fScrapeAddressField setToolTip: @""];
+    }
     
     [fScrapeLastField setObjectValue: [torrent lastScrapeTime]];
     
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 5e2021ab1..48748e5aa 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -738,7 +738,7 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
 
 - (NSString *) trackerAddressScrape
 {
-    return [NSString stringWithUTF8String: fStat->tracker->scrape];
+    return fStat->tracker->scrape ? [NSString stringWithUTF8String: fStat->tracker->scrape] : nil;
 }
 
 - (NSDate *) lastScrapeTime