a little tidyup; update NEWS

diff --git a/NEWS b/NEWS
index e7ef9b7f158ae64054d822adb9607fa410f6b3a1..210ffa28620097fb249b6fbe5e235269df29c46f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,7 +3,7 @@ NEWS file for Transmission <http://www.transmissionbt.com/>
 1.30 (2008/mm/dd)
 http://trac.transmissionbt.com/query?group=component&milestone=1.30
 - Mac
-   + Status strings are toggled from the action menu (they are no longer clickable)
+   + Status strings are toggled from the action button (they are no longer clickable)
 
 1.20 (2008/05/09)
 http://trac.transmissionbt.com/query?group=component&milestone=1.20

diff --git a/macosx/Controller.m b/macosx/Controller.m
index df5cc1a4a2b1c3272211db93c5962e893bccb407..bed8a7f6a8fe6db1ff53797c699623059019260c 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2520,7 +2520,6 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
 
 - (BOOL) outlineView: (NSOutlineView *) outlineView isItemExpandable: (id) item
 {
-
     return ![item isKindOfClass: [Torrent class]];
 }
 
@@ -2665,21 +2664,28 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
             while ((torrent = [enumerator nextObject]))
                 [torrent setGroupValue: groupValue];*/
             
-            
             NSArray * groupTorrents = [item objectForKey: @"Torrents"];
-            while (newRow > 0 && [movingTorrents containsObject: [groupTorrents objectAtIndex: newRow-1]])
-                newRow--;
-            
-            if (newRow > 0)
-                topTorrent = [groupTorrents objectAtIndex: newRow-1];
+            for (i = newRow-1; i >= 0; i--)
+            {
+                Torrent * tempTorrent = [groupTorrents objectAtIndex: i];
+                if (![movingTorrents containsObject: tempTorrent])
+                {
+                    topTorrent = tempTorrent;
+                    break;
+                }
+            }
         }
         else
         {
-            while (newRow > 0 && [movingTorrents containsObject: [fDisplayedTorrents objectAtIndex: newRow-1]])
-                newRow--;
-            
-            if (newRow > 0)
-                topTorrent = [fDisplayedTorrents objectAtIndex: newRow-1];
+            for (i = newRow-1; i >= 0; i--)
+            {
+                Torrent * tempTorrent = [fDisplayedTorrents objectAtIndex: i];
+                if (![movingTorrents containsObject: tempTorrent])
+                {
+                    topTorrent = tempTorrent;
+                    break;
+                }
+            }
         }
         
         //get all torrents to reorder

diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 0852c2b4ffa5ff23b136a42df0f312c646a19890..677e4ab0b468e5014e611c2f18467f6ade3808e9 100644 (file)
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -139,11 +139,6 @@
     [fCollapsedGroups removeIndex: value];
 }
 
-- (BOOL)shouldCollapseAutoExpandedItemsForDeposited:(BOOL)deposited
-{
-    return NO;
-}
-
 - (void) removeAllCollapsedGroups
 {
     [fCollapsedGroups removeAllIndexes];