diff options
| -rw-r--r-- | Source/SPDatabaseDocument.m | 1 | ||||
| -rw-r--r-- | Source/SPSSHTunnel.m | 8 | ||||
| -rw-r--r-- | Source/SPTableContent.h | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index bc6cce5c..947d5956 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -49,6 +49,7 @@ enum { #import "SPFileHandle.h" #import "SPKeychain.h" #import "SPTableContent.h" +#import "SPTableContentFilter.h" #import "SPCustomQuery.h" #import "SPDataImport.h" #import "ImageAndTextCell.h" diff --git a/Source/SPSSHTunnel.m b/Source/SPSSHTunnel.m index 60a8cf84..448325de 100644 --- a/Source/SPSSHTunnel.m +++ b/Source/SPSSHTunnel.m @@ -58,6 +58,8 @@ if (!theHost || !targetPort || !targetHost) return nil; if ((self = [super init])) { + SInt32 systemVersion = 0; + Gestalt(gestaltSystemVersion, &systemVersion); // Store the connection settings as appropriate sshHost = [[NSString alloc] initWithString:theHost]; @@ -69,11 +71,13 @@ delegate = nil; stateChangeSelector = nil; lastError = nil; - connectionMuxingEnabled = YES; debugMessages = [[NSMutableArray alloc] init]; debugMessagesLock = [[NSLock alloc] init]; answerAvailableLock = [[NSLock alloc] init]; - + + // Enable connection muxing on 10.7+, as 10.6 has problems with muxing (see Issue #1457) + connectionMuxingEnabled = (systemVersion >= 0x1070); + // Set up a connection for use by the tunnel process tunnelConnectionName = [[NSString alloc] initWithFormat:@"SequelPro-%lu", (unsigned long)[[NSString stringWithFormat:@"%f", [[NSDate date] timeIntervalSince1970]] hash]]; tunnelConnectionVerifyHash = [[NSString alloc] initWithFormat:@"%lu", (unsigned long)[[NSString stringWithFormat:@"%f-seeded", [[NSDate date] timeIntervalSince1970]] hash]]; diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 3e62448d..66aab772 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -53,7 +53,7 @@ @interface SPTableContent : NSObject #ifdef SP_REFACTOR -<NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate, NSResponder> +<NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate> #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; |