Monotone-Parent: 779f7c78a42d4b2a50a642ddf6b7977bc7e6d72d

Monotone-Revision: fa22dd2e0a005adc266396ab36652336d8368a4a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-07-20T18:49:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau committed 2009-07-20 18:49:56 +00:00
1 parent f714fa42bc
commit 4f43a4fbd2
3 files changed
+7 -14

No files matched your search

+2 -3
View File
@@ -55,9 +55,8 @@
- (void) setEmail: (NSString *)_s - (void) setEmail: (NSString *)_s
{ {
// WARNING /* iCal.app compatibility:
// don't touch unless you're going to re-test caldav sync - "mailto" prefix must be in lowercase; */
// with an iPhone AND lightning
[self setValue: 0 [self setValue: 0
to: [NSString stringWithFormat: @"mailto:%@", _s]]; to: [NSString stringWithFormat: @"mailto:%@", _s]];
} }
@@ -2000,9 +2000,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
content = [NSMutableArray array]; content = [NSMutableArray array];
// WARNING
// don't touch unless you're going to re-test caldav sync
// with an iPhone AND lightning
[content addObject: davElementWithContent (@"recipient", [content addObject: davElementWithContent (@"recipient",
XMLNS_CALDAV, [recipient email])]; XMLNS_CALDAV, [recipient email])];
if (user) if (user)
@@ -2223,9 +2220,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
[colType addObject: @"collection"]; [colType addObject: @"collection"];
[colType addObject: [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil]]; [colType addObject: [NSArray arrayWithObjects: @"calendar", XMLNS_CALDAV, nil]];
// WARNING /* iPhone compatibility: we can only return a caldav "calendar"
// don't touch unless you're going to re-test caldav sync resourcetype. Anything else will prevent the iPhone from querying the
// with an iPhone AND lightning collection. */
request = [context request]; request = [context request];
if (![request isIPhone]) if (![request isIPhone])
{ {
@@ -2241,8 +2238,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
login = [[context activeUser] login]; login = [[context activeUser] login];
if ([login isEqualToString: [self ownerInContext: self]]) if ([login isEqualToString: [self ownerInContext: self]])
{ {
// [colType addObject: [NSArray arrayWithObjects: @"schedule-calendar",
// XMLNS_CALDAV, nil]];
[colType addObject: [NSArray arrayWithObjects: @"schedule-inbox", [colType addObject: [NSArray arrayWithObjects: @"schedule-inbox",
XMLNS_CALDAV, nil]]; XMLNS_CALDAV, nil]];
[colType addObject: [NSArray arrayWithObjects: @"schedule-outbox", [colType addObject: [NSArray arrayWithObjects: @"schedule-outbox",
+2 -3
View File
@@ -80,9 +80,8 @@ static unsigned int freebusyRangeEnd = 0;
um = [LDAPUserManager sharedUserManager]; um = [LDAPUserManager sharedUserManager];
contactInfos = [um contactInfosForUserWithUIDorEmail: uid]; contactInfos = [um contactInfosForUserWithUIDorEmail: uid];
// WARNING /* iCal.app compatibility:
// don't touch unless you're going to re-test caldav sync - don't add "cn"; */
// with an iPhone AND lightning
person = [iCalPerson new]; person = [iCalPerson new];
[person autorelease]; [person autorelease];
[person setEmail: [contactInfos objectForKey: @"c_email"]]; [person setEmail: [contactInfos objectForKey: @"c_email"]];