aboutsummaryrefslogtreecommitdiffstats
path: root/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
diff options
context:
space:
mode:
authorrowanbeentje <rowan@beent.je>2009-07-22 09:26:11 +0000
committerrowanbeentje <rowan@beent.je>2009-07-22 09:26:11 +0000
commit48ca39af327bbba4a0fc565c37d3e165758cf731 (patch)
tree92819fef72fc19d26325ce400f1d99e47c6113a1 /Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
parent2c41f2706550e13312f50249ba9bfa6dc0a9e77d (diff)
downloadsequelpro-48ca39af327bbba4a0fc565c37d3e165758cf731.tar.gz
sequelpro-48ca39af327bbba4a0fc565c37d3e165758cf731.tar.bz2
sequelpro-48ca39af327bbba4a0fc565c37d3e165758cf731.zip
- Allow the reconnection dialogs to function correctly if anything other than "Disconnect" is selected
- Fix tunnel restarts
Diffstat (limited to 'Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m')
-rw-r--r--Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m8
1 files changed, 4 insertions, 4 deletions
diff --git a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
index 3dc94b3a..55fbca84 100644
--- a/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
+++ b/Frameworks/MCPKit/MCPFoundationKit/MCPConnection.m
@@ -292,14 +292,14 @@ static BOOL sTruncateLongFieldInLogs = YES;
}
// Select the password from the provided method
- if (!connectionPassword) {
+ if (!connectionPassword) {
if (delegate && [delegate respondsToSelector:@selector(keychainPasswordForConnection:)]) {
thePass = [self cStringFromString:[delegate keychainPasswordForConnection:self]];
}
} else {
thePass = [self cStringFromString:connectionPassword];
}
-
+
// Connect
theRet = mysql_real_connect(mConnection, theHost, theLogin, thePass, NULL, connectionPort, theSocket, mConnectionFlags);
thePass = NULL;
@@ -417,7 +417,7 @@ static BOOL sTruncateLongFieldInLogs = YES;
}
currentProxyState = [connectionProxy state];
- [connectionProxy setConnectionStateChangeSelector:@selector(sshTunnelStateChange:) delegate:self];
+ [connectionProxy setConnectionStateChangeSelector:@selector(connectionProxyStateChange:) delegate:self];
}
if (!connectionProxy || [connectionProxy state] == PROXY_STATE_CONNECTED) {
@@ -1961,7 +1961,7 @@ static void forcePingTimeout(int signalNumber)
- (void) dealloc
{
delegate = nil;
-
+
if (lastQueryErrorMessage) [lastQueryErrorMessage release];
if (connectionHost) [connectionHost release];
if (connectionLogin) [connectionLogin release];