diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-01-27 20:38:23 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-01-27 20:38:23 +0000 |
| commit | 8db2f78294982e89fce5a162d92b2be6d9291aa1 (patch) | |
| tree | b8dc7736f4af896aa3ed3fa9a96d1f3c4bfd0e59 /Source/SPConnectionController.m | |
| parent | fa7cff57548edc51420693e6909fe2adb3c18951 (diff) | |
| parent | 7cc062247ff23496dd0390cf07b5d45d6bc49777 (diff) | |
| download | sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.tar.gz sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.tar.bz2 sequelpro-8db2f78294982e89fce5a162d92b2be6d9291aa1.zip | |
Bring outline view branch up to date with trunk (r3056:r3162).
Diffstat (limited to 'Source/SPConnectionController.m')
| -rw-r--r-- | Source/SPConnectionController.m | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index c12f1ac4..9f542cec 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -285,15 +285,10 @@ static NSComparisonResult compareFavoritesUsingKey(id favorite1, id favorite2, v [favoritesOutlineView setEnabled:NO]; [addToFavoritesButton setHidden:YES]; - [addToFavoritesButton display]; [helpButton setHidden:YES]; - [helpButton display]; [connectButton setEnabled:NO]; - [connectButton display]; [progressIndicator startAnimation:self]; - [progressIndicator display]; [progressIndicatorText setHidden:NO]; - [progressIndicatorText display]; // Start the current tab's progress indicator [dbDocument setIsProcessing:YES]; @@ -424,7 +419,7 @@ static NSComparisonResult compareFavoritesUsingKey(id favorite1, id favorite2, v [self setSslCertificateFileLocation:nil]; return; } - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"crt", @"", nil]; [openPanel setAccessoryView:sslCertificateLocationHelp]; // SSL CA certificate file location: @@ -433,7 +428,7 @@ static NSComparisonResult compareFavoritesUsingKey(id favorite1, id favorite2, v [self setSslCACertFileLocation:nil]; return; } - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"", nil]; + permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"crt", @"", nil]; [openPanel setAccessoryView:sslCACertLocationHelp]; } |