From ca6f1934b3ef0bb3124f2ed9c664df7f9ae28cfa Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Mon, 20 Aug 2007 19:05:58 +0000
Subject: [PATCH] allow new menu method to use an index set instead of range

---
 macosx/NSMenuAdditions.h  |  2 +-
 macosx/NSMenuAdditions.m  | 14 ++++++++------
 macosx/TorrentTableView.m |  6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/macosx/NSMenuAdditions.h b/macosx/NSMenuAdditions.h
index d28cbe6fe..760b37545 100644
--- a/macosx/NSMenuAdditions.h
+++ b/macosx/NSMenuAdditions.h
@@ -26,6 +26,6 @@
 
 @interface NSMenu (NSMenuAdditions)
 
-- (void) moveItemsToEndFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range;
+- (void) appendItemsFromMenu: (NSMenu *) menu atIndexes: (NSIndexSet *) indexes;
 
 @end
diff --git a/macosx/NSMenuAdditions.m b/macosx/NSMenuAdditions.m
index 17a2d4c99..92be8a1b4 100644
--- a/macosx/NSMenuAdditions.m
+++ b/macosx/NSMenuAdditions.m
@@ -26,15 +26,17 @@
 
 @implementation NSMenu (NSMenuAdditions)
 
-- (void) moveItemsToEndFromMenu: (NSMenu *) oldMenu inRange: (NSRange) range
+- (void) appendItemsFromMenu: (NSMenu *) menu atIndexes: (NSIndexSet *) indexes
 {
+    int bottom = [self numberOfItems];
+    
     NSMenuItem * item;
-    int i;
-    for (i=0; i<range.length; i++)
+    unsigned int i;
+    for (i = [indexes lastIndex]; i != NSNotFound; i = [indexes indexLessThanIndex: i])
     {
-        item = [[oldMenu itemAtIndex: range.location] retain];
-        [oldMenu removeItem: item];
-        [self addItem: item];
+        item = [[menu itemAtIndex:i] retain];
+        [menu removeItem: item];
+        [self insertItem: item atIndex: bottom];
         [item release];
     }
 }
diff --git a/macosx/TorrentTableView.m b/macosx/TorrentTableView.m
index 943ea61a0..e2d035324 100644
--- a/macosx/TorrentTableView.m
+++ b/macosx/TorrentTableView.m
@@ -317,8 +317,8 @@
     [self updateFileMenu: fileMenu forFiles: [fMenuTorrent fileList]];
     
     //add file menu items to action menu
-    NSRange range = NSMakeRange(0, [fileMenu numberOfItems]);
-    [fActionMenu moveItemsToEndFromMenu: fileMenu inRange: range];
+    NSRange range =  NSMakeRange(0, [fileMenu numberOfItems]);
+    [fActionMenu appendItemsFromMenu: fileMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range]];
     
     //place menu below button
     NSRect rect = [self actionRectForRow: row];
@@ -334,7 +334,7 @@
     
     //move file menu items back to the torrent's file menu
     range.location = [fActionMenu numberOfItems] - range.length;
-    [fileMenu moveItemsToEndFromMenu: fActionMenu inRange: range];
+    [fileMenu appendItemsFromMenu: fActionMenu atIndexes: [NSIndexSet indexSetWithIndexesInRange: range]];
     
     [fMenuTorrent release];
     fMenuTorrent = nil;