amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-05 16:35:10 +00:00
Code Issues Projects Releases Wiki Activity

Fixed iCal freebusy

Browse Source 
Monotone-Parent: e48539d48e55adfdd1d2fd81c389b3490d23aeaa
Monotone-Revision: 084a7a5ec0ad85b0c967e9425da2b4b789029549

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-17T18:36:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-17 18:36:09 +00:00
parent 2691fe6389
commit e1ad72a534
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2009-07-17 Cyril Robert <crobert@inverse.ca>
* SoObjects/Appointments/SOGoAppointmentFolder.m
(freebusyResponseForRecipient): Removed CDATA tag
* SoObjects/Appointments/SOGoFreeBusyObject.m (iCalPersonWithUID): Removed
setCn, since iCal fails when present.
2009-07-16 Francis Lachapelle <flachapelle@inverse.ca>
* SoObjects/SOGo/SOGoObject.m ([SOGoObject -setOwner:]): update
SOPE/NGCards/ChangeLog
+4
View File
@@ -1,3 +1,7 @@
2009-07-17 Cyril Robert <crobert@inverse.ca>
* iCalPerson.m: Lowercased MAILTO to make it work with iCal.
2009-04-21 Francis Lachapelle <flachapelle@inverse.ca>
* iCalTrigger.m ([iCalTrigger -setRelationType:]): new method to
SOPE/NGCards/iCalPerson.m
+1 -1
View File
@@ -56,7 +56,7 @@
- (void) setEmail: (NSString *)_s
{
[self setValue: 0
to: [NSString stringWithFormat: @"MAILTO:%@", _s]];
to: [NSString stringWithFormat: @"mailto:%@", _s]];
}
- (NSString *) email
SoObjects/Appointments/SOGoAppointmentFolder.m
+4 -8
View File
@@ -1996,7 +1996,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
NSDictionary *response;
NSMutableArray *content;
SOGoWebDAVValue *cdata;
NSString *escapedData;
content = [NSMutableArray array];
@@ -2006,12 +2005,10 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
{
[content addObject: davElementWithContent (@"request-status", XMLNS_CALDAV,
@"2.0;Success")];
escapedData = [NSString stringWithFormat: @"<![CDATA[%@]]>",
escapedData = [NSString stringWithFormat: @"%@",
[calendarData stringByEscapingXMLString]];
cdata = [SOGoWebDAVValue valueForObject: escapedData
attributes: nil];
[content addObject: davElementWithContent (@"calendar-data", XMLNS_CALDAV,
cdata)];
escapedData)];
}
else
[content addObject:
@@ -2129,10 +2126,9 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
if (tags)
{
[response setStatus: 200];
[response appendContentString:@"<?xml version=\"1.0\""
@" encoding=\"utf-8\"?>"];
[response appendContentString:@"<?xml version=\"1.0\" encoding=\"utf-8\"?>"];
[response setHeader: @"application/xml; charset=utf-8"
forKey: @"Content-Type"];
forKey: @"Content-Type"];
[response appendContentString:
[tags asWebDavStringWithNamespaces: nil]];
}
SoObjects/Appointments/SOGoFreeBusyObject.m
-1
View File
@@ -82,7 +82,6 @@ static unsigned int freebusyRangeEnd = 0;
person = [iCalPerson new];
[person autorelease];
[person setCn: [contactInfos objectForKey: @"cn"]];
[person setEmail: [contactInfos objectForKey: @"c_email"]];
return person;