diff options
| author | stuconnolly <stuart02@gmail.com> | 2010-12-28 19:52:54 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2010-12-28 19:52:54 +0000 |
| commit | 37ef1ea26b8bd0e209f30474a53b9605ba8acfe6 (patch) | |
| tree | 0432f1a449d64801f8d97dfda5faa48f8440b99f /Source/SPConnectionHandler.m | |
| parent | e8bcfe72b6b59c8b881feff7ffdc8d719a82ff8c (diff) | |
| parent | 16341191bcc112fcf18ddaed2d4755b11479ba45 (diff) | |
| download | sequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.tar.gz sequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.tar.bz2 sequelpro-37ef1ea26b8bd0e209f30474a53b9605ba8acfe6.zip | |
Bring fravorites outline view branch up to date with trunk (r3036:3058).
Diffstat (limited to 'Source/SPConnectionHandler.m')
| -rw-r--r-- | Source/SPConnectionHandler.m | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/Source/SPConnectionHandler.m b/Source/SPConnectionHandler.m index 6a6bc3d6..6d777ff5 100644 --- a/Source/SPConnectionHandler.m +++ b/Source/SPConnectionHandler.m @@ -32,17 +32,8 @@ * Set up the MySQL connection, either through a successful tunnel or directly in the background. */ - (void)initiateMySQLConnection -{ - // Disable the favorites table view to prevent further connections attempts - [favoritesOutlineView setEnabled:NO]; - - if (sshTunnel) { - [progressIndicatorText setStringValue:NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message")]; - } - else { - [progressIndicatorText setStringValue:NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")]; - } - +{ + [progressIndicatorText setStringValue:(sshTunnel) ? NSLocalizedString(@"MySQL connecting...", @"MySQL connecting very short status message") : NSLocalizedString(@"Connecting...", @"Generic connecting very short status message")]; [progressIndicatorText display]; [connectButton setTitle:NSLocalizedString(@"Cancel", @"cancel button")]; @@ -295,7 +286,9 @@ certificateAuthorityCertificatePath:[self sslCACertFileLocationEnabled] ? [self [dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Disconnected", @"SSH disconnected titlebar marker")]; [self failConnectionWithTitle:NSLocalizedString(@"SSH connection failed!", @"SSH connection failed title") errorMessage:[theTunnel lastError] detail:[sshTunnel debugMessages]]; - } + + [self _restoreConnectionInterface]; + } else if (newState == PROXY_STATE_CONNECTED) { [dbDocument setTitlebarStatus:NSLocalizedString(@"SSH Connected", @"SSH connected titlebar marker")]; |