diff options
author | stuconnolly <stuart02@gmail.com> | 2012-01-22 22:40:05 +0000 |
---|---|---|
committer | stuconnolly <stuart02@gmail.com> | 2012-01-22 22:40:05 +0000 |
commit | b31bb2c4981d0a44119c43eac7525233a7c3b0e3 (patch) | |
tree | fd069ca0b10522f9f310265e499568a607b1982d /Source/SPConnectionHandler.m | |
parent | 3a0616a9aa060ccf4144a8bbdf65c647432727a4 (diff) | |
download | sequelpro-b31bb2c4981d0a44119c43eac7525233a7c3b0e3.tar.gz sequelpro-b31bb2c4981d0a44119c43eac7525233a7c3b0e3.tar.bz2 sequelpro-b31bb2c4981d0a44119c43eac7525233a7c3b0e3.zip |
Split out connection controller initialization.
Diffstat (limited to 'Source/SPConnectionHandler.m')
-rw-r--r-- | Source/SPConnectionHandler.m | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m index bca96ce1..ccdad4d1 100644 --- a/Source/SPConnectionHandler.m +++ b/Source/SPConnectionHandler.m @@ -30,7 +30,7 @@ #import "SPKeychain.h" #import "RegexKitLite.h" -@interface SPConnectionController (PrivateAPI) +@interface SPConnectionController () - (void)_restoreConnectionInterface; @@ -405,6 +405,7 @@ if (connectionKeychainItemName) { [self setPassword:[keychain getPasswordForName:connectionKeychainItemName account:connectionKeychainItemAccount]]; } + if (connectionSSHKeychainItemName) { [self setSshPassword:[keychain getPasswordForName:connectionSSHKeychainItemName account:connectionSSHKeychainItemAccount]]; } @@ -417,6 +418,7 @@ // Currently only SSH port bind errors offer a 3rd option in the error dialog, but if this ever changes // this will definitely need to be updated. else if (returnCode == NSAlertOtherReturn) { + // Extract the local port number that SSH attempted to bind to from the debug output NSString *tunnelPort = [[[errorDetailText string] componentsMatchedByRegex:@"LOCALHOST:([0-9]+)" capture:1L] lastObject]; |