aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SequelProTunnelAssistant.m
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-03-24 21:51:27 +0000
committerstuconnolly <stuart02@gmail.com>2010-03-24 21:51:27 +0000
commit3b70bf3ed475602fac435b86ab564423ae1dfdb0 (patch)
tree2328be21dbfdaec7e07caad38c2b46d26c76fcd7 /Source/SequelProTunnelAssistant.m
parent47f354070f1fa8dfeb46c4065075ee53de4c1626 (diff)
downloadsequelpro-3b70bf3ed475602fac435b86ab564423ae1dfdb0.tar.gz
sequelpro-3b70bf3ed475602fac435b86ab564423ae1dfdb0.tar.bz2
sequelpro-3b70bf3ed475602fac435b86ab564423ae1dfdb0.zip
General tidy up, with a focus on consolidating more constants in SPConstants.h/m.
Diffstat (limited to 'Source/SequelProTunnelAssistant.m')
-rw-r--r--Source/SequelProTunnelAssistant.m6
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/SequelProTunnelAssistant.m b/Source/SequelProTunnelAssistant.m
index b8d96ec5..e6b78b81 100644
--- a/Source/SequelProTunnelAssistant.m
+++ b/Source/SequelProTunnelAssistant.m
@@ -23,8 +23,10 @@
// More info at <http://code.google.com/p/sequel-pro/>
#import <Cocoa/Cocoa.h>
+
#import "SPKeychain.h"
#import "SPSSHTunnel.h"
+#import "SPConstants.h"
#import "RegexKitLite.h"
int main(int argc, const char *argv[])
@@ -68,7 +70,7 @@ int main(int argc, const char *argv[])
// If the password method is set to use the keychain, use the supplied keychain name to
// request the password
- if ([[environment objectForKey:@"SP_PASSWORD_METHOD"] integerValue] == SPSSH_PASSWORD_USES_KEYCHAIN) {
+ if ([[environment objectForKey:@"SP_PASSWORD_METHOD"] integerValue] == SPSSHPasswordUsesKeychain) {
SPKeychain *keychain;
NSString *keychainName = [environment objectForKey:@"SP_KEYCHAIN_ITEM_NAME"];
NSString *keychainAccount = [environment objectForKey:@"SP_KEYCHAIN_ITEM_ACCOUNT"];
@@ -94,7 +96,7 @@ int main(int argc, const char *argv[])
}
// If the password method is set to request the password from the tunnel instance, do so.
- if ([[environment objectForKey:@"SP_PASSWORD_METHOD"] integerValue] == SPSSH_PASSWORD_ASKS_UI) {
+ if ([[environment objectForKey:@"SP_PASSWORD_METHOD"] integerValue] == SPSSHPasswordAsksUI) {
NSString *password;
if (!connectionName || !verificationHash) {