LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use older NSPropertyListSerialization methods 

dataWithPropertyList and propertyListWithData didn't exist in gnustep 1.20
which is shipped with debian-squeeze.
pull/9/merge
Jean Raby 2013-01-29 10:31:16 -05:00
parent 902a5d8f70
commit ea13fd14c9
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Tools/SOGoToolDumpDefaults.m
View File

@ -83,10 +83,9 @@
defaultsDict = [ud persistentDomainForName: @"sogod"]; defaultsDict = [ud persistentDomainForName: @"sogod"];
} }
plistData = [NSPropertyListSerialization dataWithPropertyList: (id) defaultsDict plistData = [NSPropertyListSerialization dataFromPropertyList: (id) defaultsDict
format: NSPropertyListOpenStepFormat format: NSPropertyListOpenStepFormat
options: 0 errorDescription: 0 ];
error: 0 ];
return [[[NSString alloc] initWithData:plistData encoding:NSUTF8StringEncoding] autorelease]; return [[[NSString alloc] initWithData:plistData encoding:NSUTF8StringEncoding] autorelease];
} }
@ -94,7 +93,7 @@
- (NSString *) defaultsFromFilename: (NSString *)filename - (NSString *) defaultsFromFilename: (NSString *)filename
{ {
NSData *rawData, *plistRawData, *plistDataOpenStep; NSData *rawData, *plistRawData, *plistDataOpenStep;
NSError *err; NSString *errstr;
rawData = [NSData dataWithContentsOfFile: filename]; rawData = [NSData dataWithContentsOfFile: filename];
if (rawData == nil) if (rawData == nil)
@ -104,23 +103,22 @@
return @""; return @"";
} }
plistRawData = [NSPropertyListSerialization propertyListWithData: rawData plistRawData = [NSPropertyListSerialization propertyListFromData: rawData
options: 0 mutabilityOption: 0
format: 0 format: 0
error: &err]; errorDescription: &errstr];
if (plistRawData == nil) if (plistRawData == nil)
{ {
NSLog(@"Error converting '%s' to plist: %@", [filename UTF8String], err); NSLog(@"Error converting '%s' to plist: %@", [filename UTF8String], errstr);
return @""; return @"";
} }
plistDataOpenStep = [NSPropertyListSerialization dataWithPropertyList: (id) plistRawData plistDataOpenStep = [NSPropertyListSerialization dataFromPropertyList: (id) plistRawData
format: NSPropertyListOpenStepFormat format: NSPropertyListOpenStepFormat
options: 0 errorDescription: &errstr ];
error: &err ];
if (!plistDataOpenStep) if (!plistDataOpenStep)
{ {
NSLog(@"Error converting plist to OpenStep format: %@", err); NSLog(@"Error converting plist to OpenStep format: %@", errstr);
return @""; return @"";
} }