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

See ChangeLog

Browse Source 
Monotone-Parent: 3c56ca9ef63d29beeb411890d72b4047a46d7713
Monotone-Revision: 4126acd8a39c70e133baeb54d6b5122aac7b5b8a

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-05-31T19:12:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-05-31 19:12:46 +00:00
parent 792952088a
commit cf4de4c817
9 changed files with 100 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Scheduler/NSArray+Scheduler.m
+12 -5
View File
@@ -118,13 +118,12 @@
{
NSComparisonResult result;
unsigned int selfTime, otherTime;
Class nullClass;
result = [self _compareCompletionWithStatus1: [self objectAtIndex: 2]
andStatus2: [otherTask objectAtIndex: 2]];
andStatus2: [otherTask objectAtIndex: 2]];
if (result == NSOrderedSame)
{
nullClass = [NSNull class];
// End date
selfTime = [[self objectAtIndex: 4] intValue];
otherTime = [[otherTask objectAtIndex: 4] intValue];
if (selfTime && !otherTime)
@@ -138,8 +137,16 @@
else if (selfTime < otherTime)
result = NSOrderedAscending;
else
result = [[self objectAtIndex: 1]
compare: [otherTask objectAtIndex: 1]];
{
// Calendar ID
result = [[self objectAtIndex: 1]
compare: [otherTask objectAtIndex: 1]];
if (result == NSOrderedSame)
// Task name
result = [[self objectAtIndex: 3]
compare: [otherTask objectAtIndex: 3]
options: NSCaseInsensitiveSearch];
}
}
}