aboutsummaryrefslogtreecommitdiffstats
path: root/Source/SPConstants.m
diff options
context:
space:
mode:
authorsqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
committersqlprodev <sqlprodev@northofthree.com>2011-05-19 22:47:53 +0000
commitc80db3a0d26b394b9c88fc6ef19a90cda5340440 (patch)
treed79af344b053e24393864382958e490f4b844735 /Source/SPConstants.m
parent838faafed7af37723e8f900a6cba846a29507db2 (diff)
downloadsequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.gz
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.tar.bz2
sequelpro-c80db3a0d26b394b9c88fc6ef19a90cda5340440.zip
merging SP_REFACTOR branch with trunk
Diffstat (limited to 'Source/SPConstants.m')
-rw-r--r--Source/SPConstants.m6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index ef263d98..372987ed 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -111,9 +111,15 @@ NSString *SPConsoleEnableImportExportLogging = @"ConsoleEnableImportExportLo
NSString *SPConsoleEnableErrorLogging = @"ConsoleEnableErrorLogging";
// Network Prefpane
+#ifndef SP_REFACTOR
NSString *SPConnectionTimeoutValue = @"ConnectionTimeoutValue";
NSString *SPUseKeepAlive = @"UseKeepAlive";
NSString *SPKeepAliveInterval = @"KeepAliveInterval";
+#else
+NSString *SPConnectionTimeoutValue = @"SPConnectionTimeoutValue";
+NSString *SPUseKeepAlive = @"SPUseKeepAlive";
+NSString *SPKeepAliveInterval = @"SPKeepAliveInterval";
+#endif
// Editor Prefpane
NSString *SPCustomQueryEditorFont = @"CustomQueryEditorFont";