Use tr_torrentRenamePath() instead of the removed tr_torrentRename()

diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 7a980e3cbe7c1467ecce4059df02b00e25f0b6f1..a6e3e0a378e0efaa24b6ef84fc195e8ef930e608 100644 (file)
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -1109,7 +1109,7 @@ typedef void (tr_torrent_rename_done_func)(tr_torrent  * torrent,
  * @callback: the callback invoked when the renaming finishes, or NULL
  * @callback_data: the pointer to pass in the callback's user_data arg
  *
- * As a special case, renaming the root file in a torrent will allso
+ * As a special case, renaming the root file in a torrent will also
  * update tr_info.name.
  *
  * EXAMPLES

diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index fcb29dd274126a1ed55cd013a4153ecfeb79b617..7851f28e550f257795c73e32192f6b9d6494e096 100644 (file)
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -849,7 +849,7 @@ int trashDataFile(const char * filename)
     
     NSDictionary * contextInfo = [@{ @"Nodes" : fFileList, @"CompletionHandler" : [[completionHandler copy] autorelease] } retain];
     
-    tr_torrentRename(fHandle, [newName UTF8String], renameCallback, contextInfo);
+    tr_torrentRenamePath(fHandle, fInfo->name, [newName UTF8String], renameCallback, contextInfo);
 }
 
 - (void) renameFileNode: (FileListNode *) node withName: (NSString *) newName completionHandler: (void (^)(BOOL didRename)) completionHandler
@@ -861,8 +861,8 @@ int trashDataFile(const char * filename)
     
     NSDictionary * contextInfo = [@{ @"Nodes" : @[ node ], @"CompletionHandler" : [[completionHandler copy] autorelease] } retain];
     
-    NSString * oldName = [[node path] stringByAppendingPathComponent: [node name]];
-    tr_torrentRenamePath(fHandle, [oldName UTF8String], [newName UTF8String], renameCallback, contextInfo);
+    NSString * oldPath = [[node path] stringByAppendingPathComponent: [node name]];
+    tr_torrentRenamePath(fHandle, [oldPath UTF8String], [newName UTF8String], renameCallback, contextInfo);
 }
 
 - (CGFloat) progress