remove redundant code

diff --git a/macosx/Controller.m b/macosx/Controller.m
index bafb81eb3089b036f434e1f2f8761d5d96a93de7..08192f4fef52a62d76d56fad78ff90e20fef6e5f 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -4230,8 +4230,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) rpcUpdateQueue
 {
-    NSLog(@"rpcUpdateQueue");
-    
     for (Torrent * torrent in fTorrents)
         [torrent update];
     

diff --git a/macosx/Torrent.h b/macosx/Torrent.h
index 85ff8d6b0e89bac867e5af4fdd433575db1cd841..466799a5a4363e2294a7213266d8f1c697ad9738 100644 (file)
--- a/macosx/Torrent.h
+++ b/macosx/Torrent.h
@@ -75,6 +75,7 @@
 
 - (void) update;
 
+- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue;
 - (void) startTransferNoQueue;
 - (void) startTransfer;
 - (void) stopTransfer;

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index dbad0a16116f8cee55e6b01dbb94c8a63c1ba19a..f297efed77bc69786ea3b1c8516c1de977439f67 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -300,11 +300,11 @@ int trashDataFile(const char * filename)
         [self updateTimeMachineExclude];
 }
 
-- (void) startTransferNoQueue
+- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue
 {
     if ([self alertForRemainingDiskSpace])
     {
-        tr_torrentStartNow(fHandle);
+        ignoreQueue ? tr_torrentStartNow(fHandle) : tr_torrentStart(fHandle);
         [self update];
         
         //capture, specifically, stop-seeding settings changing to unlimited
@@ -312,17 +312,14 @@ int trashDataFile(const char * filename)
     }
 }
 
-#warning merge
+- (void) startTransferNoQueue
+{
+    [self startTransferIgnoringQueue: YES];
+}
+
 - (void) startTransfer
 {
-    if ([self alertForRemainingDiskSpace])
-    {
-        tr_torrentStart(fHandle);
-        [self update];
-        
-        //capture, specifically, stop-seeding settings changing to unlimited
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
-    }
+    [self startTransferIgnoringQueue: NO];
 }
 
 - (void) stopTransfer

diff --git a/macosx/TorrentCell.m b/macosx/TorrentCell.m
index e5ffa39bcb8bb8279c25ab4a4b7b0790c5bc6f6a..cc6e81daeeb8caea6db1c511202c69a054c0882d 100644 (file)
--- a/macosx/TorrentCell.m
+++ b/macosx/TorrentCell.m
@@ -469,7 +469,7 @@
         #warning image should use new gear
         NSString * actionImageString;
         if (fMouseDownActionButton)
-            #warning we can get rid of the on 10.7
+            #warning we can get rid of this on 10.7
             actionImageString = @"ActionOn.png";
         else if (!fTracking && fHoverAction)
             actionImageString = @"ActionHover.png";