merge of '10e4639d26e8856e1d1cce589fc7dcdd0639f703'

and '5402e16ca9d296346561a48b192ce3ed97373e2c'

Monotone-Parent: 10e4639d26e8856e1d1cce589fc7dcdd0639f703
Monotone-Parent: 5402e16ca9d296346561a48b192ce3ed97373e2c
Monotone-Revision: 75884864019e8268f2d2a24b534d0020370d2de5

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-06-04T20:54:51
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoFolder.h

@@ -41,6 +41,9 @@
 
 - (NSString *) folderType;
 
+- (NSArray *) toOneRelationshipKeys;
+- (NSArray *) toManyRelationshipKeys;
+
 - (BOOL) isValidContentName: (NSString *) name;
 
 /* sorting */

SoObjects/SOGo/SOGoGCSFolder.h

@@ -116,6 +116,8 @@
 - (NSDictionary *) davSQLFieldsTable;
 - (NSDictionary *) parseDAVRequestedProperties: (DOMElement *) propElement;
 
+- (NSString *) davCollectionTag;
+
 @end
 
 #endif /* __SOGo_SOGoGCSFolder_H__ */