Changeset 13256

Timestamp:

Mar 18, 2012, 2:33:50 PM (11 years ago)

Author:

livings124

Message:

#4839 Use configuration directory retrieved from libtransmission

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (4 diffs)

trunk/macosx/Controller.h

@@ -62 +62 @@
     NSUserDefaults                  * fDefaults;
     
+    NSString                        * fConfigDirectory;
+    
     IBOutlet NSWindow               * fWindow;
     DragOverlayWindow               * fOverlayWindow;

trunk/macosx/Controller.m

@@ -325 +325 @@
         tr_bencFree(&settings);
         
+        fConfigDirectory = [[NSString alloc] initWithUTF8String: configDir];
+        
         [NSApp setDelegate: self];
         
@@ -445 +447 @@
     
     //load previous transfers
-    NSURL * historyURL = [[[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationSupportDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission"] URLByAppendingPathComponent: TRANSFER_PLIST];
-    NSArray * history = [NSArray arrayWithContentsOfURL: historyURL];
+    NSString * historyFile = [fConfigDirectory stringByAppendingPathComponent: TRANSFER_PLIST];
+    NSArray * history = [NSArray arrayWithContentsOfFile: historyFile];
     if (!history)
     {
@@ -724 +726 @@
     
     [fPreviewPanel release];
+    
+    [fConfigDirectory release];
     
     //complete cleanup
@@ -1904 +1908 @@
         [history addObject: [torrent history]];
     
-    NSURL * historyURL = [[[[[NSFileManager defaultManager] URLsForDirectory: NSApplicationSupportDirectory inDomains: NSUserDomainMask] objectAtIndex: 0] URLByAppendingPathComponent: @"Transmission"] URLByAppendingPathComponent: TRANSFER_PLIST];
-    [history writeToURL: historyURL atomically: YES];
+    NSString * historyFile = [fConfigDirectory stringByAppendingPathComponent: TRANSFER_PLIST];
+    [history writeToFile: historyFile atomically: YES];
 }