From 82a38c87fb72e388d7f59495a5bc456545afa677 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 5 May 2010 13:48:06 +0000 Subject: [PATCH] Monotone-Parent: 4fb71d76cac3b87ffc098133f9c93d0e753c5284 Monotone-Revision: de6d837f5c2b62b4ad465872fdc54602b3d1009c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-05-05T13:48:06 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 4 ++++ SOPE/NGCards/iCalPerson.h | 1 + SOPE/NGCards/iCalPerson.m | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index ac57bddf2..20ec67b1f 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,5 +1,9 @@ 2010-05-05 Wolfgang Sourdeau + * iCalPerson.m (-setParticipationStatus:, -participationStatus): + added handling of the new partstat value + "iCalPersonPartStatUndefined". + * iCalEntityObject.m (-resources): removed useless method. (-nonParticipants): new method returning ATTENDEE objects having their ROLE attribute set to "NON-PARTICIPANT". diff --git a/SOPE/NGCards/iCalPerson.h b/SOPE/NGCards/iCalPerson.h index 6c7644673..4aac91d14 100644 --- a/SOPE/NGCards/iCalPerson.h +++ b/SOPE/NGCards/iCalPerson.h @@ -25,6 +25,7 @@ #import "CardElement.h" typedef enum { + iCalPersonPartStatUndefined = -1, /* empty/undefined */ iCalPersonPartStatNeedsAction = 0, /* NEEDS-ACTION (DEFAULT) */ iCalPersonPartStatAccepted = 1, /* ACCEPTED */ iCalPersonPartStatDeclined = 2, /* DECLINED */ diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m index 971a0d101..449c1b012 100644 --- a/SOPE/NGCards/iCalPerson.m +++ b/SOPE/NGCards/iCalPerson.m @@ -133,6 +133,9 @@ NSString *stat; switch (_status) { + case iCalPersonPartStatUndefined: + stat = @""; + break; case iCalPersonPartStatAccepted: stat = @"ACCEPTED"; break; @@ -170,7 +173,9 @@ NSString *stat; stat = [[self partStat] uppercaseString]; - if (![stat length] || [stat isEqualToString:@"NEEDS-ACTION"]) + if (![stat length]) + return iCalPersonPartStatUndefined; + else if ([stat isEqualToString:@"NEEDS-ACTION"]) return iCalPersonPartStatNeedsAction; else if ([stat isEqualToString:@"ACCEPTED"]) return iCalPersonPartStatAccepted;