From ff6af7b86aa2c20bcea6f80b806c533feeed77f5 Mon Sep 17 00:00:00 2001 From: Mitchell Livingston Date: Mon, 28 May 2012 17:43:51 +0000 Subject: [PATCH] when migrating old blacklists, use URLs instead of string paths and don't hardcode the Application Support folder location --- macosx/PrefsController.m | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m index 5baca4adf..1d5c4a171 100644 --- a/macosx/PrefsController.m +++ b/macosx/PrefsController.m @@ -103,10 +103,9 @@ tr_session * fHandle; [fDefaults setObject: blocklistDate forKey: @"BlocklistNewLastUpdate"]; [fDefaults removeObjectForKey: @"BlocklistLastUpdate"]; - NSString * blocklistDir = [NSHomeDirectory() stringByAppendingPathComponent: - @"/Library/Application Support/Transmission/blocklists/"]; - [[NSFileManager defaultManager] moveItemAtPath: [blocklistDir stringByAppendingPathComponent: @"level1.bin"] - toPath: [blocklistDir stringByAppendingPathComponent: [NSString stringWithUTF8String: DEFAULT_BLOCKLIST_FILENAME]] + NSURL * blocklistDir = [[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission/blocklists/"]; + [[NSFileManager defaultManager] moveItemAtURL: [blocklistDir URLByAppendingPathComponent: @"level1.bin"] + toURL: [blocklistDir URLByAppendingPathComponent: [NSString stringWithUTF8String: DEFAULT_BLOCKLIST_FILENAME]] error: nil]; } @@ -444,8 +443,7 @@ tr_session * fHandle; { NSMutableArray * sounds = [NSMutableArray array]; - NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory, - NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES); + NSArray * directories = NSSearchPathForDirectoriesInDomains(NSAllLibrariesDirectory, NSUserDomainMask | NSLocalDomainMask | NSSystemDomainMask, YES); for (NSString * directory in directories) {