aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstuconnolly <stuart02@gmail.com>2010-12-13 22:02:17 +0000
committerstuconnolly <stuart02@gmail.com>2010-12-13 22:02:17 +0000
commit9859a8f8b20ebf038967a09b40bba9b4eb2f223b (patch)
tree3a889fb8e2600968784c74f925f5ffdacdb05440
parentbb7fbb3c5ba1ccbf879ac7a54d30b6b7d2082c9a (diff)
downloadsequelpro-9859a8f8b20ebf038967a09b40bba9b4eb2f223b.tar.gz
sequelpro-9859a8f8b20ebf038967a09b40bba9b4eb2f223b.tar.bz2
sequelpro-9859a8f8b20ebf038967a09b40bba9b4eb2f223b.zip
Use connection favorite constants.
-rw-r--r--Interfaces/English.lproj/ConnectionView.xib29
-rw-r--r--Source/SPConnectionController.m8
2 files changed, 5 insertions, 32 deletions
diff --git a/Interfaces/English.lproj/ConnectionView.xib b/Interfaces/English.lproj/ConnectionView.xib
index 10a2abe3..500c5b45 100644
--- a/Interfaces/English.lproj/ConnectionView.xib
+++ b/Interfaces/English.lproj/ConnectionView.xib
@@ -21,8 +21,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="5477"/>
<integer value="5468"/>
+ <integer value="5345"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -431,7 +431,6 @@
</object>
</object>
</object>
- <int key="NSSelectedIndex">9</int>
<bool key="NSPullDown">YES</bool>
<int key="NSPreferredEdge">1</int>
<bool key="NSUsesItemFromMenu">YES</bool>
@@ -2352,9 +2351,6 @@
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSFrameAutosaveName"/>
</object>
- <object class="NSUserDefaultsController" id="642702582">
- <bool key="NSSharedInstance">YES</bool>
- </object>
<object class="NSCustomView" id="567906875">
<nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
@@ -4754,11 +4750,6 @@
<reference key="parent" ref="699163511"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">5455</int>
- <reference key="object" ref="642702582"/>
- <reference key="parent" ref="0"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">5576</int>
<reference key="object" ref="567906875"/>
<object class="NSMutableArray" key="children">
@@ -6520,7 +6511,6 @@
<string>5435.IBPluginDependency</string>
<string>5436.IBPluginDependency</string>
<string>5447.IBPluginDependency</string>
- <string>5455.IBPluginDependency</string>
<string>5468.IBEditorWindowLastContentRect</string>
<string>5468.IBPluginDependency</string>
<string>5469.IBPluginDependency</string>
@@ -6971,7 +6961,6 @@
<string>com.brandonwalkin.BWToolkit</string>
<string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{472, 412}, {142, 123}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -8056,14 +8045,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSController</string>
- <string key="superclassName">NSObject</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSFormatter</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -8625,14 +8606,6 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSUserDefaultsController</string>
- <string key="superclassName">NSController</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBFrameworkSource</string>
- <string key="minorKey">AppKit.framework/Headers/NSUserDefaultsController.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m
index adc7a893..4bafafbf 100644
--- a/Source/SPConnectionController.m
+++ b/Source/SPConnectionController.m
@@ -585,8 +585,8 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist";
// Check whether the password exists in the keychain, and if so add it; also record the
// keychain details so we can pass around only those details if the password doesn't change
- connectionKeychainItemName = [[keychain nameForFavoriteName:[self valueForKeyPath:@"selectedFavorite.name"] id:[self valueForKeyPath:@"selectedFavorite.id"]] retain];
- connectionKeychainItemAccount = [[keychain accountForUser:[self valueForKeyPath:@"selectedFavorite.user"] host:(([self type] == SPSocketConnection)?@"localhost":[self valueForKeyPath:@"selectedFavorite.host"]) database:[self valueForKeyPath:@"selectedFavorite.database"]] retain];
+ connectionKeychainItemName = [[keychain nameForFavoriteName:[fav objectForKey:SPFavoriteNameKey] id:[fav objectForKey:SPFavoriteIDKey]] retain];
+ connectionKeychainItemAccount = [[keychain accountForUser:[fav objectForKey:SPFavoriteUserKey] host:(([self type] == SPSocketConnection) ? @"localhost" : [fav objectForKey:SPFavoriteHostKey]) database:[fav objectForKey:SPFavoriteDatabaseKey]] retain];
[self setPassword:[keychain getPasswordForName:connectionKeychainItemName account:connectionKeychainItemAccount]];
@@ -597,8 +597,8 @@ static const NSString *SPExportFavoritesFilename = @"SequelProFavorites.plist";
}
// And the same for the SSH password
- connectionSSHKeychainItemName = [[keychain nameForSSHForFavoriteName:[self valueForKeyPath:@"selectedFavorite.name"] id:[self valueForKeyPath:@"selectedFavorite.id"]] retain];
- connectionSSHKeychainItemAccount = [[keychain accountForSSHUser:[self valueForKeyPath:@"selectedFavorite.sshUser"] sshHost:[self valueForKeyPath:@"selectedFavorite.sshHost"]] retain];
+ connectionSSHKeychainItemName = [[keychain nameForSSHForFavoriteName:[fav objectForKey:SPFavoriteNameKey] id:[fav objectForKey:SPFavoriteIDKey]] retain];
+ connectionSSHKeychainItemAccount = [[keychain accountForSSHUser:[fav objectForKey:SPFavoriteSSHUserKey] sshHost:[fav objectForKey:SPFavoriteSSHHostKey]] retain];
[self setSshPassword:[keychain getPasswordForName:connectionSSHKeychainItemName account:connectionSSHKeychainItemAccount]];