From b36ee1f3a13e82a63325719afba5759bf69ce8c8 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 8 Feb 2008 19:34:02 +0000 Subject: [PATCH] Monotone-Parent: 1fc0f0efe44f0b423ba86ab0885c6e0372c62a19 Monotone-Revision: b1ea99e2992e038d5c1adfe3f755a473b8b52150 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-02-08T19:34:02 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/CardElement.m | 2 +- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/iCalRecurrenceRule.m | 11 +++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/SOPE/NGCards/CardElement.m b/SOPE/NGCards/CardElement.m index 9767359b6..b3ccea5d4 100644 --- a/SOPE/NGCards/CardElement.m +++ b/SOPE/NGCards/CardElement.m @@ -314,7 +314,7 @@ [self addValue: newValue]; else { - if (aValue) + if ([aValue length]) [self setValue: index to: newValue]; else [values removeObjectAtIndex: index]; diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 8fd11bd86..d6521f136 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2008-02-08 Wolfgang Sourdeau + + * CardElement.m ([CardElement + -setNamedValue:aValueNameto:aValue]): if the value is empty, we + removed the named value. + 2008-01-28 Wolfgang Sourdeau * iCalRecurrenceRule.m ([iCalRecurrenceRule diff --git a/SOPE/NGCards/iCalRecurrenceRule.m b/SOPE/NGCards/iCalRecurrenceRule.m index afeb28d0d..006e46365 100644 --- a/SOPE/NGCards/iCalRecurrenceRule.m +++ b/SOPE/NGCards/iCalRecurrenceRule.m @@ -251,9 +251,16 @@ [self setNamedValue: @"wkst" to: _weekStart]; } +#warning we also should handle the user weekstarts - (NSString *) wkst { - return [self namedValue: @"wkst"]; + NSString *start; + + start = [self namedValue: @"wkst"]; + if (![start length]) + start = @"SU"; + + return start; } - (void) setWeekStart: (iCalWeekDay) _weekStart @@ -359,7 +366,7 @@ case 'S': if (chars[1] == 'A') foundDay = iCalWeekDaySaturday; - else if (chars[1] == 'H') + else if (chars[1] == 'U') foundDay = iCalWeekDaySunday; } }