Merge remote-tracking branch 'sequelpro/master'

1 files changed, 7 insertions, 11 deletions

diff --git a/Source/SPConstants.m b/Source/SPConstants.m
index eb11ac11..d9729980 100644
--- a/Source/SPConstants.m
+++ b/Source/SPConstants.m
@@ -229,11 +229,13 @@ NSString *SPHiddenKeyFileVisibilityKey           = @"KeySelectionHiddenFilesVisi
 NSString *SPSelectionDetailTypeIndexed           = @"SelectionDetailTypeNSIndexSet";
 NSString *SPSelectionDetailTypePrimaryKeyed      = @"SelectionDetailTypePrimaryKeyedDetails";
 NSString *SPSSHEnableMuxingPreference            = @"SSHMultiplexingEnabled";
+NSString *SPSSHClientPath                        = @"SSHClientPath";
+NSString *SPSSLCipherListKey                     = @"SSLCipherList";
 
 // URLs
 NSString *SPDonationsURL                         = @"http://www.sequelpro.com/donate/";
 NSString *SPMySQLSearchURL                       = @"http://dev.mysql.com/doc/refman/%@/%@/%@.html";
-NSString *SPDevURL                               = @"http://code.google.com/p/sequel-pro/";
+NSString *SPDevURL                               = @"https://github.com/sequelpro/sequelpro";
 
 // Toolbar constants
 
@@ -412,18 +414,12 @@ NSString *SPBundleShellVariableSelectedText                 = @"SP_SELECTED_TEXT
 NSString *SPBundleShellVariableSelectedTextRange            = @"SP_SELECTED_TEXT_RANGE";
 NSString *SPBundleShellVariableUsedQueryForTable            = @"SP_USED_QUERY_FOR_TABLE";
 
-const NSInteger SPBundleRedirectActionNone                 = 200;
-const NSInteger SPBundleRedirectActionReplaceSection       = 201;
-const NSInteger SPBundleRedirectActionReplaceContent       = 202;
-const NSInteger SPBundleRedirectActionInsertAsText         = 203;
-const NSInteger SPBundleRedirectActionInsertAsSnippet      = 204;
-const NSInteger SPBundleRedirectActionShowAsHTML           = 205;
-const NSInteger SPBundleRedirectActionShowAsTextTooltip    = 207;
-const NSInteger SPBundleRedirectActionShowAsHTMLTooltip    = 208;
-const NSInteger SPBundleRedirectActionLastCode             = 208;
-
 // URL scheme
 NSString *SPURLSchemeQueryInputPathHeader          = @"/tmp/SP_QUERY_";
 NSString *SPURLSchemeQueryResultPathHeader         = @"/tmp/SP_QUERY_RESULT_";
 NSString *SPURLSchemeQueryResultStatusPathHeader   = @"/tmp/SP_QUERY_RESULT_STATUS_";
 NSString *SPURLSchemeQueryResultMetaPathHeader     = @"/tmp/SP_QUERY_META_";
+
+void inline _SPClear(id *addr) {
+	[*addr release], *addr = nil;
+}