major oopsies fixed; log spew removed, prefs are honored immediately …

…instead of upon next launch, fixed problems with sparkle updating and sIFR prefs not working
simX · Jun 25, 2009 · 488ee14 · 488ee14
1 parent 030877d
commit 488ee14
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 deletions.
diff --git a/Plugin/CTFPreferencesDictionary.h b/Plugin/CTFPreferencesDictionary.h
@@ -11,6 +11,7 @@
 
 @interface CTFPreferencesDictionary : NSMutableDictionary {
 	NSMutableDictionary *realMutableDictionary;
+	BOOL hasInited;
 }
 
 @end
diff --git a/Plugin/CTFPreferencesDictionary.m b/Plugin/CTFPreferencesDictionary.m
@@ -13,6 +13,7 @@
 
 #import "CTFPreferencesDictionary.h"
 
+static CTFPreferencesDictionary *sharedInstance = nil;
 
 @implementation CTFPreferencesDictionary
 
@@ -21,19 +22,36 @@ + (id)dictionaryWithDictionary:(NSDictionary *)otherDictionary;
 	return [[CTFPreferencesDictionary alloc] initWithDictionary:otherDictionary];
 }
 
++ (id)allocWithZone:(NSZone *)zone;
+{
+	if (sharedInstance) {
+		return [sharedInstance retain];
+	} else {
+		return [super allocWithZone:zone];
+	}
+}
+
 - (id)init;
 {
-	if ((self = [super init])) {
-		realMutableDictionary = [[NSMutableDictionary alloc] init];
+	if (! sharedInstance) {
+		if ((self = [super init])) {
+			realMutableDictionary = [[NSMutableDictionary alloc] init];
+			hasInited = YES;
+		}
 	}
 
 	return self;
 }
 
 - (id)initWithDictionary:(NSDictionary *)otherDictionary;
 {
-	if ((self = [super init])) {
-		realMutableDictionary = [[NSMutableDictionary dictionaryWithDictionary:otherDictionary] retain];
+	if (! sharedInstance) {
+		if ((self = [super init])) {
+			realMutableDictionary = [[NSMutableDictionary dictionaryWithDictionary:otherDictionary] retain];
+			hasInited = YES;
+		}
+	} else {
+		[sharedInstance setDictionary:otherDictionary];
 	}
 
 	return self;

diff --git a/Plugin/CTFUserDefaultsController.m b/Plugin/CTFUserDefaultsController.m
@@ -18,6 +18,15 @@ + (CTFUserDefaultsController *)standardUserDefaults;
 	return sharedInstance;
 }
 
++ (id)allocWithZone:(NSZone *)zone;
+{
+	if (sharedInstance) {
+		return [sharedInstance retain];
+	} else {
+		return [super allocWithZone:zone];
+	}
+}
+
 - (id)init;
 {
 	if (! sharedInstance) {
@@ -56,7 +65,9 @@ - (CTFPreferencesDictionary *)values;
 	// and if that call detects that the user defaults dictionary hasn't
 	// been set up yet, it sets it up and *then* returns the values
 
-	if (! userDefaultsDict) [self setUpExternalPrefsDictionary];
+	if (! userDefaultsDict) {
+		[self setUpExternalPrefsDictionary];
+	}
 	return userDefaultsDict;
 }
 

diff --git a/Plugin/CTFsIFRSupport.m b/Plugin/CTFsIFRSupport.m
@@ -35,7 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
 	CTFSifrModeDeSifr		= 2
 } CTFSifrMode;
 
-static NSString *sSifrModeDefaultsKey = @"ClickToFlash_sifrMode";
+static NSString *sSifrModeDefaultsKey = @"sifrMode";
 
 static NSString *sSifr2Test		= @"sIFR != null && typeof sIFR == \"function\"";
 static NSString *sSifr3Test		= @"sIFR != null && typeof sIFR == \"object\"";

diff --git a/Plugin/Plugin.m b/Plugin/Plugin.m
@@ -104,13 +104,11 @@ - (id) initWithArguments:(NSDictionary *)arguments
     self = [super init];
     if (self) {		
 		[[NSUserDefaults standardUserDefaults] addSuiteNamed:@"com.github.rentzsch.clicktoflash"];
-				NSLog(@"ummmm0");
 		SparkleManager *sharedSparkleManager = [SparkleManager sharedManager];
 		NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
 		NSString *pathToRelaunch = [sharedWorkspace absolutePathForAppBundleWithIdentifier:[self launchedAppBundleIdentifier]];
 		[sharedSparkleManager setPathToRelaunch:pathToRelaunch];
         [sharedSparkleManager startAutomaticallyCheckingForUpdates];
-        		NSLog(@"ummmm");
         if (![[CTFUserDefaultsController standardUserDefaults] objectForKey:sAutoLoadInvisibleFlashViewsKey]) {
             //  Default to auto-loading invisible flash views.
             [[CTFUserDefaultsController standardUserDefaults] setBool:YES forKey:sAutoLoadInvisibleFlashViewsKey];
@@ -119,7 +117,6 @@ - (id) initWithArguments:(NSDictionary *)arguments
 			// Default to enable the plugin
 			[[CTFUserDefaultsController standardUserDefaults] setBool:YES forKey:sPluginEnabled];
 		}
-				NSLog(@"ummmm2");
 		[self setLaunchedAppBundleIdentifier:[self launchedAppBundleIdentifier]];
 
 		[self setWebView:[[[arguments objectForKey:WebPlugInContainerKey] webFrame] webView]];
@@ -384,7 +381,6 @@ - (void)_migratePrefsToExternalFile
 	unsigned int i;
 	for (i = 0; i < [parasiticDefaultsNameArray count]; i++) {
 		NSString *currentParasiticDefault = [parasiticDefaultsNameArray objectAtIndex:i];
-		NSLog(@"sending objectForKey: to a CTFUserDefaultsController");
 		id prefValue = [[NSUserDefaults standardUserDefaults] objectForKey:currentParasiticDefault];
 		if (prefValue) {
 			[externalFileDefaults setObject:prefValue forKey:[externalDefaultsNameArray objectAtIndex:i]];

diff --git a/Plugin/SparkleManager.m b/Plugin/SparkleManager.m
@@ -31,7 +31,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "CTFPreferencesDictionary.h"
 
 // NSUserDefaults keys
-static NSString *sAutomaticallyCheckForUpdates = @"ClickToFlash_checkForUpdatesOnFirstLoad";
+static NSString *sAutomaticallyCheckForUpdates = @"checkForUpdatesOnFirstLoad";
 
 @implementation SparkleManager