From e406ece2195aa4e4c0855a7b30223ad347d81d70 Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Mon, 30 Jul 2007 22:19:52 +0000
Subject: [PATCH] use libtransmission's "can announce" functionality instead of
 custom mac code

---
 macosx/Controller.m |  6 ++----
 macosx/Torrent.h    |  5 ++---
 macosx/Torrent.m    | 14 ++------------
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/macosx/Controller.m b/macosx/Controller.m
index ae3a7bfe2..d4a6828df 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1324,8 +1324,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
     NSDate * date;
     while ((torrent = [enumerator nextObject]))
     {
-        //time interval returned will be negative
-        if (!(date = [torrent announceDate]) || [date timeIntervalSinceNow] <= ANNOUNCE_WAIT_INTERVAL_SECONDS)
+        if ([torrent canAnnounce])
             [torrent announce];
     }
 }
@@ -2896,8 +2895,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
         while ((torrent = [enumerator nextObject]))
         {
             //time interval returned will be negative
-            if ([torrent isActive] &&
-                    (!(date = [torrent announceDate]) || [date timeIntervalSinceNow] <= ANNOUNCE_WAIT_INTERVAL_SECONDS))
+            if ([torrent canAnnounce])
                 return YES;
         }
         return NO;
diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 4aaa5ce6a..5ca08af56 100644
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -37,8 +37,7 @@
     int fID;
     
     BOOL         fResumeOnWake;
-    NSDate       * fDateAdded, * fDateCompleted, * fAnnounceDate,
-                * fDateActivity;
+    NSDate       * fDateAdded, * fDateCompleted, * fDateActivity;
     
     BOOL        fUseIncompleteFolder;
     NSString    * fDownloadFolder, * fIncompleteFolder;
@@ -92,7 +91,7 @@
 - (void) wakeUp;
 
 - (void) announce;
-- (NSDate *) announceDate;
+- (BOOL) canAnnounce;
 
 - (void) resetCache;
 
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 0a1f6c46b..1aae205a9 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -171,8 +171,6 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
     [fDateCompleted release];
     [fDateActivity release];
     
-    [fAnnounceDate release];
-    
     [fIcon release];
     [fIconFlipped release];
     [fIconSmall release];
@@ -559,20 +557,12 @@ static uint32_t kRed   = BE(0xFF6450FF), //255, 100, 80
 
 - (void) announce
 {
-    if (![self isActive])
-        return;
-    
-    #warning doesn't work!
     tr_manualUpdate(fHandle);
-    
-    if (fAnnounceDate)
-        [fAnnounceDate release];
-    fAnnounceDate = [[NSDate date] retain];
 }
 
-- (NSDate *) announceDate
+- (BOOL) canAnnounce
 {
-    return fAnnounceDate;
+    return tr_torrentCanManualUpdate(fHandle);
 }
 
 - (void) resetCache