* Source/NSString.m (-initWithCoder:): Handle format used for XIB

encoding.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29962 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Fred Kiefer 2010-03-15 12:43:49 +00:00
parent c2b8427723
commit b6456d570d
2 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,7 @@
2010-03-15 Fred Kiefer <FredKiefer@gmx.de>
* Source/NSString.m (-initWithCoder:): Handle format used for XIB encoding.
2010-03-14 Adam Fedor <fedor@mallory>
* Source/NSHTTPCookie.m (+requestHeaderFieldsWithCookies:):

View file

@ -4611,8 +4611,18 @@ static NSFileManager *fm = nil;
{
if ([aCoder allowsKeyedCoding])
{
NSString *string = (NSString*)[(NSKeyedUnarchiver*)aCoder
_decodePropertyListForKey: @"NS.string"];
NSString *string = nil;
if ([aCoder containsValueForKey: @"NS.string"])
{
string = (NSString*)[(NSKeyedUnarchiver*)aCoder
_decodePropertyListForKey: @"NS.string"];
}
else if ([aCoder containsValueForKey: @"NS.bytes"])
{
string = (NSString*)[(NSKeyedUnarchiver*)aCoder
decodeObjectForKey: @"NS.bytes"];
}
self = [self initWithString: string];
}