diff --git a/ChangeLog b/ChangeLog index 4ac97057f..31bb08301 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2007-12-06 Wolfgang Sourdeau + * SoObjects/Contacts/SOGoContactLDAPFolder.m + ([SOGoContactLDAPFolder -davResourceType]): declared as a carddav + addressbook collection. + + * SoObjects/Contacts/SOGoContactGCSFolder.m ([SOGoContactGCSFolder + -davResourceType]): declared as a carddav addressbook collection. + * SoObjects/SOGo/SOGoObject.m ([SOGoObject -davLastModified]): override SoObject's implementation. Otherwise a localized date is returned. diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m index 074048b8a..dfc77caef 100644 --- a/SoObjects/Contacts/SOGoContactGCSFolder.m +++ b/SoObjects/Contacts/SOGoContactGCSFolder.m @@ -267,6 +267,21 @@ return @"vcard-collection"; } +- (NSArray *) davResourceType +{ + NSMutableArray *resourceType; + NSArray *cardDavCollection; + + cardDavCollection + = [NSArray arrayWithObjects: @"addressbook", + @"urn:ietf:params:xml:ns:carddav", nil]; + + resourceType = [NSMutableArray arrayWithArray: [super davResourceType]]; + [resourceType addObject: cardDavCollection]; + + return resourceType; +} + /* sorting */ - (NSComparisonResult) compare: (id) otherFolder { diff --git a/SoObjects/Contacts/SOGoContactLDAPFolder.m b/SoObjects/Contacts/SOGoContactLDAPFolder.m index a23f09a53..f3d173283 100644 --- a/SoObjects/Contacts/SOGoContactLDAPFolder.m +++ b/SoObjects/Contacts/SOGoContactLDAPFolder.m @@ -140,6 +140,21 @@ return @"vcard-collection"; } +- (NSArray *) davResourceType +{ + NSMutableArray *resourceType; + NSArray *cardDavCollection; + + cardDavCollection + = [NSArray arrayWithObjects: @"addressbook", + @"urn:ietf:params:xml:ns:carddav", nil]; + + resourceType = [NSMutableArray arrayWithArray: [super davResourceType]]; + [resourceType addObject: cardDavCollection]; + + return resourceType; +} + - (id) lookupName: (NSString *) objectName inContext: (WOContext *) lookupContext acquire: (BOOL) acquire