Changeset 6168

Timestamp:

Jun 13, 2008, 4:05:54 AM (14 years ago)

Author:

livings124

Message:

eliminate an unnecessary variable and improve the behavior of the proxy keychain

Location:

trunk/macosx

Files:

• Controller.m (modified) (1 diff)
• PrefsController.h (modified) (1 diff)
• PrefsController.m (modified) (7 diffs)

trunk/macosx/Controller.m

@@ -229 +229 @@
                                 [fDefaults boolForKey: @"ProxyAuthorize"],
                                 [[fDefaults stringForKey: @"ProxyUsername"] UTF8String],
-                                NULL); /* reset in prefs - from Keychain */
+                                ""); /* reset in prefs - from Keychain (leave blank instead of NULL) */
         
         [NSApp setDelegate: self];

trunk/macosx/PrefsController.h

@@ -60 +60 @@
     IBOutlet NSTextField * fProxyAddressField, * fProxyPasswordField;
     IBOutlet NSPopUpButton * fProxyTypePopUp;
-    NSString * fProxyPassword;
     BOOL fProxyPasswordSet;
     

trunk/macosx/PrefsController.m

@@ -111 +111 @@
         
         fProxyPasswordSet = NO;
-        if ([fProxyPasswordField isEnabled])
+        if ([fDefaults boolForKey: @"Proxy"] && [fDefaults boolForKey: @"ProxyAuthorize"])
             [self updateProxyPassword];
         
@@ -138 +138 @@
         [fPortChecker release];
     }
-    
-    [fProxyPassword release];
     
     [fRPCAccessArray release];
@@ -213 +211 @@
     }
     [fProxyTypePopUp selectItemAtIndex: proxyType];
-    [fProxyPasswordField setStringValue: fProxyPassword ? fProxyPassword : @""];
+    [fProxyPasswordField setStringValue: [NSString stringWithUTF8String: tr_sessionGetProxyPassword(fHandle)]];
     
     //set blocklist
@@ -678 +676 @@
 - (void) setProxyEnabled: (id) sender
 {
+    BOOL enable = [fDefaults boolForKey: @"Proxy"];
     tr_sessionSetProxyEnabled(fHandle, [fDefaults boolForKey: @"Proxy"]);
     
     //if proxy password hasn't be retrieved, get it now
-    if (!fProxyPasswordSet && [fProxyPasswordField isEnabled])
-    {
+    if (!fProxyPasswordSet && enable && [fDefaults boolForKey: @"ProxyAuthorize"])
         [self updateProxyPassword];
-        [fProxyPasswordField setStringValue: fProxyPassword];
-    }
 }
 
@@ -752 +748 @@
 - (void) setProxyAuthorize: (id) sender
 {
-    tr_sessionSetProxyAuthEnabled(fHandle, [fDefaults boolForKey: @"ProxyAuthorize"]);
+    BOOL enable = [fDefaults boolForKey: @"ProxyAuthorize"];
+    tr_sessionSetProxyAuthEnabled(fHandle, enable);
     
     //if proxy password hasn't be retrieved, get it now
-    if (!fProxyPasswordSet && [fProxyPasswordField isEnabled])
-    {
+    if (!fProxyPasswordSet && enable)
         [self updateProxyPassword];
-        [fProxyPasswordField setStringValue: fProxyPassword];
-    }
 }
 
@@ -769 +763 @@
 - (void) setProxyPassword: (id) sender
 {
-    [fProxyPassword release];
-    fProxyPassword = [[sender stringValue] retain];
+    NSString * password = [[sender stringValue] retain];
     
     EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
                                             withUsername: @"Proxy"];
     if (keychainItem)
-        [keychainItem setPassword: fProxyPassword];
+        [keychainItem setPassword: password];
     else
         [[EMKeychainProxy sharedProxy] addGenericKeychainItemForService: @"Transmission:Proxy" withUsername: @"Proxy"
-            password: fProxyPassword];
-    
-    tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]);
+            password: password];
+    
+    tr_sessionSetProxyPassword(fHandle, [password UTF8String]);
 }
 
@@ -787 +780 @@
     fProxyPasswordSet = YES;
     
-    [fProxyPassword release];
-    
+    NSString * password;
     EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"
                                             withUsername: @"Proxy"];
-    if (!(fProxyPassword = [keychainItem password]))
-        fProxyPassword = @"";
-    [fProxyPassword retain];
-    
-    tr_sessionSetProxyPassword(fHandle, [fProxyPassword UTF8String]);
+    if (!(password = [keychainItem password]))
+        password = @"";
+    
+    tr_sessionSetProxyPassword(fHandle, [password UTF8String]);
+    
+    [fProxyPasswordField setStringValue: password];
 }