remove redundant code

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];
     

macosx/Torrent.h

@@ -75,6 +75,7 @@
 
 - (void) update;
 
+- (void) startTransferIgnoringQueue: (BOOL) ignoreQueue;
 - (void) startTransferNoQueue;
 - (void) startTransfer;
 - (void) stopTransfer;

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])
+    [self startTransferIgnoringQueue: NO];
-    {
-        tr_torrentStart(fHandle);
-        [self update];
-        
-        //capture, specifically, stop-seeding settings changing to unlimited
-        [[NSNotificationCenter defaultCenter] postNotificationName: @"UpdateOptions" object: nil];
-    }
 }
 
 - (void) stopTransfer

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";