merge of 'afd67b085b60bc29f1319198a1796a532db22ebf'

and 'c0c3d56a3486d587b4e272a42efcc42e8a77897e'

Monotone-Parent: afd67b085b60bc29f1319198a1796a532db22ebf
Monotone-Parent: c0c3d56a3486d587b4e272a42efcc42e8a77897e
Monotone-Revision: 004e35b648d1070b320f15c658e3294fe8cc154e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-21T23:45:09
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,9 @@
+2011-10-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/plreader.m (PLReaderDumpPListFile): ignore "error" if
+	the returned property list object is not nil, since "error" might
+	still be set with GNUstep.
+
 2011-10-21  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/SOGo/SOGoUserManager.m

OpenChange/plreader.m

@@ -153,9 +153,7 @@ PLReaderDumpPListFile (NSString *filename)
                                        mutabilityOption: NSPropertyListImmutable
                                                  format: &format
                                        errorDescription: &error];
-  if (error)
-    printf ("an error occurred: %s\n", [error UTF8String]);
-  else
+  if (d)
     {
       switch (format)
         {
@@ -181,6 +179,8 @@ PLReaderDumpPListFile (NSString *filename)
       [d displayWithIndentation: 0];
       printf ("\n");
     }
+  else
+    printf ("an error occurred: %s\n", [error UTF8String]);
 }
 
 int main()