From ea13fd14c97ac3c58e1c50d3b82d0657715f1016 Mon Sep 17 00:00:00 2001
From: Jean Raby <jraby@inverse.ca>
Date: Tue, 29 Jan 2013 10:31:16 -0500
Subject: [PATCH] Use older NSPropertyListSerialization methods

dataWithPropertyList and propertyListWithData didn't exist in gnustep 1.20
which is shipped with debian-squeeze.
---
 Tools/SOGoToolDumpDefaults.m | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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