From dcb952e1b7e04e2c42c43338e72602d0a588e7f9 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 28 Mar 2012 15:05:58 +0000
Subject: [PATCH] Monotone-Parent: f8af7a968c459aff400e85a6c5422a0c7a370167
 Monotone-Revision: 600b3a1c268cabeca401fb335f2e4c76bd1709b7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-03-28T15:05:58
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                               |  6 ++++++
 SoObjects/Contacts/SOGoFolder+CardDAV.m | 17 +++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index efb9ae8ec..ca5486e35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2012-03-28  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Contacts/SOGoFolder+CardDAV.m (_isValidFilter:):
+	accept "email" as filter name.
+	(_appendObject:withBaseURL:toREPORTResponse:): fixed the ordering
+	of XML elements as the address*-data props where put outside of
+	the <D:prop> tree.
+
 	* SoObjects/SOGo/LDAPSource.m (-allEntryIDs): take the _filter
 	ivar into account.
 
diff --git a/SoObjects/Contacts/SOGoFolder+CardDAV.m b/SoObjects/Contacts/SOGoFolder+CardDAV.m
index fed4c2105..3466e940e 100644
--- a/SoObjects/Contacts/SOGoFolder+CardDAV.m
+++ b/SoObjects/Contacts/SOGoFolder+CardDAV.m
@@ -73,17 +73,17 @@
       etagLine = [NSString stringWithFormat: @"<D:getetag>%@</D:getetag>",
                            [component davEntityTag]];
       [r appendContentString: etagLine];
-      [r appendContentString: @"</D:prop>"
-                        @"<D:status>HTTP/1.1 200 OK</D:status>"
-                       @"</D:propstat>"
-                        @"<C:addressbook-data>"];
+      [r appendContentString: @"<C:address-data>"];
       contactString = [[component contentAsString] stringByEscapingXMLString];
       [r appendContentString: contactString];
-      [r appendContentString: @"</C:addressbook-data>"
-                        @"<C:address-data>"];
-      [r appendContentString: contactString];
       [r appendContentString: @"</C:address-data>"
-                     @"</D:response>"];
+                        @"<C:addressbook-data>"];
+      [r appendContentString: contactString];
+      [r appendContentString: @"</C:addressbook-data>"
+         @"</D:prop>"
+         @"<D:status>HTTP/1.1 200 OK</D:status>"
+         @"</D:propstat>"
+         @"</D:response>"];
     }
 }
 
@@ -124,6 +124,7 @@
 
   return ([newString isEqualToString: @"sn"]
 	  || [newString isEqualToString: @"givenname"]
+	  || [newString isEqualToString: @"email"]
 	  || [newString isEqualToString: @"mail"]
 	  || [newString isEqualToString: @"telephonenumber"]);
 }