From e2db4d45fe2702fb4f9ab7b49383ddb1fb3546ee Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 7 Jun 2007 18:05:45 +0000 Subject: [PATCH] Monotone-Parent: f2a6e6c575e2fd5429604d257d06fef7dcb07e7e Monotone-Revision: 1bb31b9d946a5a28ab4dc649d5ce05cc69379763 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-06-07T18:05:45 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/NSString+NGCards.m | 10 +--------- SOPE/NGCards/iCalDateTime.m | 6 +++--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/SOPE/NGCards/NSString+NGCards.m b/SOPE/NGCards/NSString+NGCards.m index a53378a5c..2076e63b1 100644 --- a/SOPE/NGCards/NSString+NGCards.m +++ b/SOPE/NGCards/NSString+NGCards.m @@ -258,15 +258,7 @@ static NSString *commaSeparator = nil; - (BOOL) isAllDayDate { - unsigned int length; - unichar lastZ; - - length = [self length]; - lastZ = [self characterAtIndex: length - 1]; - - return (length == 8 - || (length == 9 - && (lastZ == 'Z' || lastZ == 'z'))); + return ([self length] == 8); } - (NSArray *) commaSeparatedValues diff --git a/SOPE/NGCards/iCalDateTime.m b/SOPE/NGCards/iCalDateTime.m index bf18fd8a8..6391d748b 100644 --- a/SOPE/NGCards/iCalDateTime.m +++ b/SOPE/NGCards/iCalDateTime.m @@ -109,10 +109,10 @@ tmpTime = [dateTime copy]; [tmpTime setTimeZone: utcTZ]; if (forAllDayEntity) - fmtTimeString = [tmpTime iCalFormattedDateString]; + timeString = [tmpTime iCalFormattedDateString]; else - fmtTimeString = [tmpTime iCalFormattedDateTimeString]; - timeString = [NSString stringWithFormat: @"%@Z", fmtTimeString]; + timeString = [NSString stringWithFormat: @"%@Z", + [tmpTime iCalFormattedDateTimeString]]; [tmpTime release]; } }