Changeset 6169

Timestamp:

Jun 13, 2008, 4:22:07 AM (15 years ago)

Author:

livings124

Message:

since keychain is smart enough to not ask to unlock a keychain if the desired key doesn't exist anyway, it's probably fair to always try to get the proxy password from the keychain at launch

Location:

trunk/macosx

Files:

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

trunk/macosx/PrefsController.h

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

trunk/macosx/PrefsController.m

@@ -110 +110 @@
         [self updateProxyType];
         
-        fProxyPasswordSet = NO;
-        if ([fDefaults boolForKey: @"Proxy"] && [fDefaults boolForKey: @"ProxyAuthorize"])
-            [self updateProxyPassword];
+        [self updateProxyPassword];
         
         //update rpc access list
@@ -678 +676 @@
     BOOL enable = [fDefaults boolForKey: @"Proxy"];
     tr_sessionSetProxyEnabled(fHandle, [fDefaults boolForKey: @"Proxy"]);
-    
-    //if proxy password hasn't be retrieved, get it now
-    if (!fProxyPasswordSet && enable && [fDefaults boolForKey: @"ProxyAuthorize"])
-        [self updateProxyPassword];
 }
 
@@ -750 +744 @@
     BOOL enable = [fDefaults boolForKey: @"ProxyAuthorize"];
     tr_sessionSetProxyAuthEnabled(fHandle, enable);
-    
-    //if proxy password hasn't be retrieved, get it now
-    if (!fProxyPasswordSet && enable)
-        [self updateProxyPassword];
 }
 
@@ -776 +766 @@
 }
 
+//user will only be prompted if Keychain is locked and Transmission has changed since last launched
 - (void) updateProxyPassword
 {
-    fProxyPasswordSet = YES;
-    
     NSString * password;
     EMGenericKeychainItem * keychainItem = [[EMKeychainProxy sharedProxy] genericKeychainItemForService: @"Transmission:Proxy"