From 37d2f449b325f9f5b11481a0464d40be7d472262 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 21 Oct 2011 23:44:29 +0000
Subject: [PATCH] Monotone-Parent: aeb6c6e374c725f1249d84119e6cc1b7ce8d1f1a
 Monotone-Revision: c0c3d56a3486d587b4e272a42efcc42e8a77897e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-21T23:44:29
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog             | 6 ++++++
 OpenChange/plreader.m | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9c52c637..1dcba29c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-21  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-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreDraftsMessage.m (-getPrDisplayTo:inMemCtx:)
diff --git a/OpenChange/plreader.m b/OpenChange/plreader.m
index 003c2aef3..68c7a81e5 100644
--- a/OpenChange/plreader.m
+++ b/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()