amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-28 17:57:38 +00:00
Code Issues Projects Releases Wiki Activity

merge of '31bc4f6b49316e2603b7496cfee3b18fdd5e490f'

Browse Source 
and '5244339e45ef9095573b10733228f85b81a17377'

Monotone-Parent: 31bc4f6b49316e2603b7496cfee3b18fdd5e490f
Monotone-Parent: 5244339e45ef9095573b10733228f85b81a17377
Monotone-Revision: 4437a82e041d016710ea3a45d8b7cf5b6341afff

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-10-13T21:08:25
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2009-10-13 21:08:25 +00:00
parent 2da9e90ebc 114e8bddc3
commit bf95e10746
23 changed files with 67 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/SOGoAppointmentObject.m
+2 -4
View File
@@ -813,7 +813,7 @@
if (removeDelegate)
{
delegates = [NSMutableArray new];
delegates = [NSMutableArray array];
while (otherDelegate)
{
@@ -846,7 +846,6 @@
[self sendReceiptEmailUsingTemplateNamed: @"Deletion"
forObject: event
to: delegates];
[delegates release];
}
if (addDelegate)
@@ -939,7 +938,7 @@
NSMutableArray *element;
NSDictionary *code;
element = [NSMutableArray new];
element = [NSMutableArray array];
[element addObject: davElementWithContent (@"recipient", XMLNS_CALDAV,
recipient)];
[element addObject: davElementWithContent (@"request-status",
@@ -947,7 +946,6 @@
@"2.0;Success")];
code = davElementWithContent (@"response", XMLNS_CALDAV,
element);
[element release];
return code;
}
SoObjects/Appointments/SOGoUserFolder+Appointments.m
+4 -8
View File
@@ -327,10 +327,10 @@
NSMutableArray *response, *props;
NSDictionary *keyTuple;
response = [NSMutableArray new];
response = [NSMutableArray array];
[response addObject: davElementWithContent (@"href", XMLNS_WEBDAV,
[collection davURL])];
props = [NSMutableArray new];
props = [NSMutableArray array];
max = [properties count];
for (count = 0; count < max; count++)
{
@@ -360,8 +360,6 @@
props))];
[responses addObject: davElementWithContent (@"response", XMLNS_WEBDAV,
response)];
[props release];
[response release];
}
- (void) _appendProperties: (NSArray *) properties
@@ -396,16 +394,14 @@
document = [[context request] contentAsDOMDocument];
documentElement = [document documentElement];
matches = [NSMutableDictionary new];
properties = [NSMutableArray new];
matches = [NSMutableDictionary dictionary];
properties = [NSMutableArray array];
[self _fillPrincipalMatches: matches andProperties: properties
fromElement: documentElement];
collections = [self _principalCollectionsMatching: matches];
r = [self _prepareResponseFromContext: queryContext];
[self _appendProperties: properties ofCollections: collections
toResponse: r];
[properties release];
[matches release];
return r;
// @"<D:response><D:href>/SOGo/dav/wsourdeau/</D:href>"