* Please note this revision will re-prompt for access to all KeyChain passwords *

 - Change the bundle identifier from com.google.code.sequel-pro to com.sequelpro.SequelPro
 - Change the code signing process to use a new identity and requirement, to add Developer ID support on 10.7+ but to also maintain functionality on 10.5+
 - Add a preference migration routine to copy the old application defaults to the new bundle identifier's defaults
 - Re-order the default keys to alphabetical to more easily locate values

1 files changed, 27 insertions, 1 deletions

diff --git a/Source/SPPreferencesUpgrade.m b/Source/SPPreferencesUpgrade.m
index 3dbd7647..208bbab4 100644
--- a/Source/SPPreferencesUpgrade.m
+++ b/Source/SPPreferencesUpgrade.m
@@ -48,7 +48,14 @@ void SPApplyRevisionChanges(void)
 	NSUInteger currentVersionNumber, recordedVersionNumber = 0;
 	
 	NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
-	
+
+	// If this is the first run, check for a preferences with the old bundle identifier and
+	// migrate them before running any preference upgrade routines
+	if ([prefs boolForKey:SPFirstRun]) {
+		SPMigratePreferencesFromPreviousIdentifer();
+		[prefs setBool:NO forKey:SPFirstRun];
+	}
+
 	// Get the current bundle version number (the SVN build number) for per-version upgrades
 	currentVersionNumber = [[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"] integerValue];
 	
@@ -386,4 +393,23 @@ void SPMigrateConnectionFavoritesData(void)
 	[favorites release];
 }
 
+/**
+ * Migrates across all preferences for an old bundle identifier to the current preferences file.
+ */
+void SPMigratePreferencesFromPreviousIdentifer(void)
+{
+	NSUserDefaults *prefs = [NSUserDefaults standardUserDefaults];
+
+	CFStringRef oldIdentifier = CFSTR("com.google.code.sequel-pro");
+	CFArrayRef oldPrefKeys = CFPreferencesCopyKeyList(oldIdentifier, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+	NSDictionary *oldPrefs = (NSDictionary *)CFPreferencesCopyMultiple(oldPrefKeys, oldIdentifier, kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
+
+	for (id eachKey in oldPrefs) {
+		[prefs setObject:[oldPrefs objectForKey:eachKey] forKey:eachKey];
+	}
+
+	[oldPrefs release];
+	CFRelease(oldPrefKeys);
+}
+
 @end