X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=OSX%2FPrefsReader.m;h=4f42fa90e9f3b8d289d73aec242d692597d61c40;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=dd9170fe9fa938ac4c0421b812d0659fcefa4081;hpb=c70f94f648d51bb4828193124f325fa52b0e57f3;p=xscreensaver diff --git a/OSX/PrefsReader.m b/OSX/PrefsReader.m index dd9170fe..4f42fa90 100644 --- a/OSX/PrefsReader.m +++ b/OSX/PrefsReader.m @@ -1,4 +1,4 @@ -/* xscreensaver, Copyright (c) 2006-2012 Jamie Zawinski +/* xscreensaver, Copyright (c) 2006-2013 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -146,6 +146,7 @@ // make sure there's no resource mentioned in options and not defaults. if (![defsdict objectForKey:nsresource]) { if (! (!strcmp(resource, "font") || // don't warn about these + !strcmp(resource, "foreground") || !strcmp(resource, "textLiteral") || !strcmp(resource, "textFile") || !strcmp(resource, "textURL") || @@ -332,7 +333,7 @@ else if (n == 1) return YES; else goto FAIL; } else if ([o isKindOfClass:[NSString class]]) { - NSString *s = (NSString *) o; + NSString *s = [((NSString *) o) lowercaseString]; if ([s isEqualToString:@"true"] || [s isEqualToString:@"yes"] || [s isEqualToString:@"1"]) @@ -369,6 +370,7 @@ NSRange r = [name rangeOfString:@"." options:NSBackwardsSearch]; if (r.length) name = [name substringFromIndex:r.location+1]; + name = [name stringByReplacingOccurrencesOfString:@" " withString:@""]; saver_name = [name retain]; [self registerXrmKeys:opts defaults:defs];