Mantis 22

Monotone-Parent: 5105aa2c752693060f4e82dcab091d78516d579f
Monotone-Revision: 002cfad9d108ff7c2b34603852b074ecd764cf96

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-21T18:06:55
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-21 18:06:55 +00:00
parent 21a245668b
commit 6b70e8480d
20 changed files with 187 additions and 5 deletions
+4 -1
View File
@@ -321,6 +321,8 @@ static NSArray *tasksFields = nil;
folders = [[clientObject subFolders] objectEnumerator];
while ((currentFolder = [folders nextObject]))
{
if (![component isEqualToString: @"vtodo"] || [currentFolder showCalendarTasks])
{
if ([currentFolder isActive])
{
currentInfos
@@ -344,6 +346,7 @@ static NSArray *tasksFields = nil;
notFoundMarker: marker]];
}
}
}
}
return infos;
@@ -409,7 +412,7 @@ static NSArray *tasksFields = nil;
folders = [[clientObject subFolders] objectEnumerator];
while ((currentFolder = [folders nextObject]))
{
if ([currentFolder isActive])
if ([currentFolder isActive] && [currentFolder showCalendarAlarms])
{
NSDictionary *entry;
NSArray *alarms;