diff options
| author | rowanbeentje <rowan@beent.je> | 2013-01-29 23:42:04 +0000 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2013-01-29 23:42:04 +0000 |
| commit | 74aa78f132d4339164d1722c9008c00981e81bf6 (patch) | |
| tree | 11d32396cb9fc0c23b8a0c8a74ff26bc0762b8b1 | |
| parent | 80fdadaa9375d443ec37982a438c4251912cda77 (diff) | |
| download | sequelpro-74aa78f132d4339164d1722c9008c00981e81bf6.tar.gz sequelpro-74aa78f132d4339164d1722c9008c00981e81bf6.tar.bz2 sequelpro-74aa78f132d4339164d1722c9008c00981e81bf6.zip | |
- Allow all filenames/types in SSH and SSL key/cert selection dialogs, to fix naming issues; addresses Issue #1544 and Issue #1493release-1.0.1
| -rw-r--r-- | Source/SPConnectionController.m | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index 52cb75bc..752c0c00 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -363,7 +363,6 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, { NSString *directoryPath = nil; NSString *filePath = nil; - NSArray *permittedFileTypes = nil; keySelectionPanel = [NSOpenPanel openPanel]; [keySelectionPanel setShowsHiddenFiles:[prefs boolForKey:SPHiddenKeyFileVisibilityKey]]; @@ -388,8 +387,6 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, directoryPath = [sshKeyLocation stringByDeletingLastPathComponent]; } - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"key", @"", nil]; - [keySelectionPanel setAccessoryView:sshKeyLocationHelp]; } // SSL key file location: @@ -399,8 +396,6 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, return; } - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"key", @"", nil]; - [keySelectionPanel setAccessoryView:sslKeyFileLocationHelp]; } // SSL certificate file location: @@ -409,9 +404,7 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, [self setSslCertificateFileLocation:nil]; return; } - - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"crt", @"", nil]; - + [keySelectionPanel setAccessoryView:sslCertificateLocationHelp]; } // SSL CA certificate file location: @@ -421,14 +414,12 @@ static NSComparisonResult _compareFavoritesUsingKey(id favorite1, id favorite2, return; } - permittedFileTypes = [NSArray arrayWithObjects:@"pem", @"cert", @"crt", @"", nil]; - [keySelectionPanel setAccessoryView:sslCACertLocationHelp]; } [keySelectionPanel beginSheetForDirectory:directoryPath file:filePath - types:permittedFileTypes + types:nil modalForWindow:[dbDocument parentWindow] modalDelegate:self didEndSelector:@selector(chooseKeyLocationSheetDidEnd:returnCode:contextInfo:) |