From 6debe52e72ad8d4055cb2acb76d024e2d3f229a8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 26 Oct 2006 16:33:38 +0000 Subject: [PATCH] Monotone-Parent: 65e85a0c1825401dd092e3ed519e16162a7e4fe1 Monotone-Revision: b2f62cdaa21cb716943261705698e2506dfcb55f Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2006-10-26T16:33:38 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OGoContentStore/OCSiCalFieldExtractor.m | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b4269fe..17cf18a1e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-10-26 Wolfgang Sourdeau + + * OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor + -extractQuickFieldsFromEvent:_event]): changed "TENTATIVE" code to + 2 and "CANCELLED" to 0. + 2006-10-25 Wolfgang Sourdeau * UI/WebServerResources/UIxAppointmentEditor.js: handle conversion diff --git a/OGoContentStore/OCSiCalFieldExtractor.m b/OGoContentStore/OCSiCalFieldExtractor.m index 6dbd3a8bb..09cbe20ef 100644 --- a/OGoContentStore/OCSiCalFieldExtractor.m +++ b/OGoContentStore/OCSiCalFieldExtractor.m @@ -143,14 +143,14 @@ static NSNumber *distantFutureNumber = nil; int code = 1; if ([status isEqualToString:@"TENTATIVE"]) - code = 0; - else if ([status isEqualToString:@"CANCELLED"]) code = 2; + else if ([status isEqualToString:@"CANCELLED"]) + code = 0; [row setObject:[NSNumber numberWithInt:code] forKey:@"status"]; } else { /* confirmed by default */ - [row setObject:[NSNumber numberWithInt:1] forKey:@"status"]; + [row setObject: [NSNumber numberWithInt:1] forKey: @"status"]; } if([accessClass isNotNull] && ![accessClass isEqualToString:@"PUBLIC"]) {