Plugins/Displays/Smoke/GrowlSmokeWindowView.m
changeset 4259 0e9b6b0b1e25
parent 4246 4f52d1d98978
child 4541 9a290d3de636
     1.1 --- a/Plugins/Displays/Smoke/GrowlSmokeWindowView.m	Tue Jul 07 11:42:50 2009 -0400
     1.2 +++ b/Plugins/Displays/Smoke/GrowlSmokeWindowView.m	Sat Aug 01 20:43:39 2009 -0400
     1.3 @@ -290,9 +290,11 @@
     1.4  	NSData *data = nil;
     1.5  
     1.6  	READ_GROWL_PREF_VALUE(key, GrowlSmokePrefDomain, NSData *, &data);
     1.7 +	if(data)
     1.8 +		CFMakeCollectable(data);		
     1.9  	if (data && [data isKindOfClass:NSDataClass]) {
    1.10 -		bgColor = [NSUnarchiver unarchiveObjectWithData:data];
    1.11 -		bgColor = [bgColor colorWithAlphaComponent:backgroundAlpha];
    1.12 +			bgColor = [NSUnarchiver unarchiveObjectWithData:data];
    1.13 +			bgColor = [bgColor colorWithAlphaComponent:backgroundAlpha];
    1.14  	} else {
    1.15  		bgColor = [NSColor colorWithCalibratedWhite:0.1 alpha:backgroundAlpha];
    1.16  	}
    1.17 @@ -302,13 +304,17 @@
    1.18  
    1.19  	[textColor release];
    1.20  	READ_GROWL_PREF_VALUE(textKey, GrowlSmokePrefDomain, NSData *, &data);
    1.21 -	if (data && [data isKindOfClass:NSDataClass])
    1.22 -		textColor = [NSUnarchiver unarchiveObjectWithData:data];
    1.23 -	else
    1.24 +	if(data)
    1.25 +		CFMakeCollectable(data);		
    1.26 +	if (data && [data isKindOfClass:NSDataClass]) {
    1.27 +			textColor = [NSUnarchiver unarchiveObjectWithData:data];
    1.28 +	} else {
    1.29  		textColor = [NSColor whiteColor];
    1.30 +	}
    1.31  	[textColor retain];
    1.32  	[data release];
    1.33 -
    1.34 +	data = nil;
    1.35 +	
    1.36  	[textShadow setShadowColor:[bgColor blendedColorWithFraction:0.5 ofColor:[NSColor blackColor]]];
    1.37  }
    1.38