LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Slightly improved previous commit to avoid losing X- elements.

pull/7/head
Ludovic Marcotte 2012-11-20 08:30:41 -05:00
parent a1d092cab0
commit 1fdcf843f3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
SOPE/NGCards/CardVersitRenderer.m
View File

@ -127,17 +127,23 @@
if (order) if (order)
{ {
NSMutableArray *orderedElements; NSMutableArray *orderedElements, *originalElements;
NSArray *currentChildren;
int i, c; int i, c;
originalElements = [NSMutableArray arrayWithArray: [aGroup children]];
orderedElements = [NSMutableArray array]; orderedElements = [NSMutableArray array];
c = [order count]; c = [order count];
for (i = 0; i < c; i++) for (i = 0; i < c; i++)
{ {
[orderedElements addObjectsFromArray: [aGroup childrenWithTag: [order objectAtIndex: i]]]; currentChildren = [aGroup childrenWithTag: [order objectAtIndex: i]];
[orderedElements addObjectsFromArray: currentChildren];
[originalElements removeObjectsInArray: currentChildren];
} }
// We add the remaining, unordered elements
[orderedElements addObjectsFromArray: originalElements];
children = [orderedElements objectEnumerator]; children = [orderedElements objectEnumerator];
} }
else else

2
SOPE/NGCards/iCalCalendar.m
View File

@ -212,7 +212,7 @@
- (NSArray *) orderOfElements - (NSArray *) orderOfElements
{ {
return [NSArray arrayWithObjects: @"prodid", @"version", @"method", @"calscale", @"x-wr-calname", return [NSArray arrayWithObjects: @"prodid", @"version", @"method", @"calscale",
@"vtimezone", @"vevent", @"vtodo", @"vjournal", @"vfreebusy", nil]; @"vtimezone", @"vevent", @"vtodo", @"vjournal", @"vfreebusy", nil];
} }