protect some additional dictionaries

Quicksilver/Code-QuickStepCore/QSObject.h

@@ -63,7 +63,7 @@ typedef struct _QSObjectFlags {
 
 	NSMutableDictionary *	meta; 		//Name, Label, Type, Identifier, Source, embedded details
 	NSMutableDictionary *	data; 		//Data or typed dictionary (multiTyped Object)
-	NSMutableDictionary *	cache; 		//Icons, children, alias data,
+	QSThreadSafeMutableDictionary *cache; 		//Icons, children, alias data,
 	QSObjectFlags			flags;
 	NSTimeInterval			lastAccess;
 }

Quicksilver/Code-QuickStepCore/QSObject.m

@@ -67,6 +67,7 @@ - (id)init {
 
 		data = [NSMutableDictionary dictionaryWithCapacity:0];
 		meta = [NSMutableDictionary dictionaryWithCapacity:0];
+		cache = [QSThreadSafeMutableDictionary dictionaryWithCapacity:0];
 		name = nil;
 		label = nil;
 		icon = nil;
@@ -441,15 +442,13 @@ - (void)setObject:(id)object forCache:(id)aKey {
     if (!aKey) {
         return;
     }
-    @synchronized([self cache]) {
-        if (object) {
-            if (object != [[self cache] objectForKey:aKey]) {
-                [[self cache] setObject:object forKey:aKey];
-            }
-        } else {
-            [[self cache] removeObjectForKey:aKey];
-        }
-    }
+	if (object) {
+		if (object != [[self cache] objectForKey:aKey]) {
+			[[self cache] setObject:object forKey:aKey];
+		}
+	} else {
+		[[self cache] removeObjectForKey:aKey];
+	}
 }
 
 - (id)objectForMeta:(id)aKey {
@@ -470,12 +469,11 @@ - (void)setObject:(id)object forMeta:(id)aKey {
 }
 
 - (NSMutableDictionary *)cache {
-	if (!cache) [self setCache:[NSMutableDictionary dictionaryWithCapacity:1]];
 	return cache;
 }
 - (void)setCache:(NSMutableDictionary *)aCache {
 	if (cache != aCache) {
-		cache = aCache;
+		cache = [QSThreadSafeMutableDictionary dictionaryWithDictionary:aCache];
 	}
 }
 

Quicksilver/Code-QuickStepCore/QSRegistry.h

@@ -17,10 +17,10 @@ extern QSRegistry *QSReg; // Registry shared instance
 @interface QSRegistry : NSObject {
 	NSMutableDictionary *classRegistry; //Dictionaries of registered class names for specific purposes
 	NSMutableDictionary *tableInstances; //Dictionaries of class instances, only maintained for requested types
-	NSMutableDictionary *classInstances; //Dictionary of class instances by name
+	QSThreadSafeMutableDictionary *classInstances; //Dictionary of class instances by name
 	NSMutableDictionary *classBundles; //Bundles containing registered classes
 	NSMutableDictionary *identifierBundles; //Bundles by identifier
-	NSMutableDictionary *prefInstances; //Preferred Instances of tables
+	QSThreadSafeMutableDictionary *prefInstances; //Preferred Instances of tables
 	NSMutableDictionary *infoRegistry; //Plists containing various plugin information
 
 	BOOL initialLoadComplete;

Quicksilver/Code-QuickStepCore/QSRegistry.m

@@ -32,10 +32,10 @@ - (id)init {
 	if (self = [super init]) {
 		classRegistry = [[NSMutableDictionary alloc] init];
 		tableInstances = [[NSMutableDictionary alloc] init];
-		classInstances = [[NSMutableDictionary alloc] init];
+		classInstances = [[QSThreadSafeMutableDictionary alloc] init];
 		classBundles = [[NSMutableDictionary alloc] init];
 		identifierBundles = [[NSMutableDictionary alloc] init];
-		prefInstances = [[NSMutableDictionary alloc] init];
+		prefInstances = [[QSThreadSafeMutableDictionary alloc] init];
 		infoRegistry = [[NSMutableDictionary alloc] init];
 		[self objectSources];
 		[self objectHandlers];