Changeset 4312

Timestamp:

Dec 24, 2007, 3:29:29 PM (14 years ago)

Author:

livings124

Message:

use tr_initFull

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• PrefsController.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -193 +193 @@
     if ((self = [super init]))
     {
-        fLib = tr_init("macosx");
+        fDefaults = [NSUserDefaults standardUserDefaults];
+        
+        fLib = tr_initFull("macosx",
+                        [fDefaults boolForKey: @"PEXGlobal"],
+                        [fDefaults boolForKey: @"NatTraversal"],
+                        [fDefaults integerForKey: @"BindPort"],
+                        TR_ENCRYPTION_PREFERRED, /* reset in prefs */
+                        FALSE, /* reset in prefs */
+                        -1, /* reset in prefs */
+                        FALSE, /* reset in prefs */
+                        -1, /* reset in prefs */
+                        [fDefaults integerForKey: @"PeersGlobal"]);
         
         [NSApp setDelegate: self];
@@ -199 +210 @@
         fTorrents = [[NSMutableArray alloc] init];
         fDisplayedTorrents = [[NSMutableArray alloc] init];
-        
-        fDefaults = [NSUserDefaults standardUserDefaults];
         
         fMessageController = [[MessageWindowController alloc] init];

trunk/macosx/PrefsController.m

@@ -73 +73 @@
             [[UKKQueue sharedFileWatcher] addPath: [autoPath stringByExpandingTildeInPath]];
         
-        //set bind port
-        tr_setBindPort(fHandle, [fDefaults integerForKey: @"BindPort"]);
-        
-        //set NAT
-        tr_natTraversalEnable(fHandle, [fDefaults boolForKey: @"NatTraversal"]);
-        
-        //set peer connection values
-        tr_setGlobalPeerLimit(fHandle, [fDefaults integerForKey: @"PeersGlobal"]);
-        
-        //set pex
-        [self setPEX: nil];
-        
         //set encryption
         [self setEncryptionMode: nil];