some cleanup of the Mac integration of libT queue code (we're getting there, but...

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 8f4fb02c75065541ed3443b06e126f9150a25269..eb816e140c881798ebd49093c72b2f9d01e501f5 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -1221,11 +1221,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     for (Torrent * torrent in torrents)
         [torrent startTransferNoQueue];
     
-    #warning change to updateTorrentsInQueue?
-    [self updateUI];
-    [self applyFilter];
-    [[fWindow toolbar] validateVisibleItems];
-    [self updateTorrentHistory];
+    [self updateTorrentsInQueue];
 }
 
 - (void) stopSelectedTorrents: (id) sender
@@ -1247,10 +1243,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
     [torrents makeObjectsPerformSelector: @selector(stopTransfer)];
     
-    [self updateUI];
-    [self applyFilter];
-    [[fWindow toolbar] validateVisibleItems];
-    [self updateTorrentHistory];
+    [self updateTorrentsInQueue];
 }
 
 - (void) removeTorrents: (NSArray *) torrents deleteData: (BOOL) deleteData

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 6246c736cecf47abbd098b85036ddc051a7a8779..67bb71a57b15e27c7f73b1b7a2fe6ad2bdf9ec9b 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -328,9 +328,6 @@ int trashDataFile(const char * filename)
     {
         tr_torrentStop(fHandle);
         [self update];
-        
-        #warning still needed?
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateQueue" object: self];
     }
 }
 
@@ -614,9 +611,8 @@ int trashDataFile(const char * filename)
 
 - (NSString *) name
 {
-#warning remove
-    //return [NSString stringWithFormat: @"%d  %@", fStat->queuePosition, [NSString stringWithUTF8String: fInfo->name]];
-    return fInfo->name != NULL ? [NSString stringWithUTF8String: fInfo->name] : fHashString;
+    return [NSString stringWithFormat: @"%d  %@", fStat->queuePosition, [NSString stringWithUTF8String: fInfo->name]];
+    //return fInfo->name != NULL ? [NSString stringWithUTF8String: fInfo->name] : fHashString;
 }
 
 - (BOOL) isFolder