From c018b949977bb193d56912c26eacef3016ba1550 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 30 Aug 2010 19:49:58 +0000 Subject: [PATCH] Monotone-Parent: 7e7946ac70e135f3e208b210455b3238dd36d951 Monotone-Revision: daae15bcf9e4793ea2109c4e41219071a3e94636 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-30T19:49:58 Monotone-Branch: ca.inverse.sogo --- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/iCalPerson.m | 4 ++-- SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index ce782ad2d..8a9219906 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2010-08-30 Wolfgang Sourdeau + + * iCalPerson.m, iCalWeeklyRecurrenceCalculator.m: adapted classes + to use "NSInteger" and "NSUInteger" instead of "int" and "unsigned + int" for compatibility with versions of GNUstep base >= 1.20. + 2010-08-24 Francis Lachapelle * CardElement.m (-setNamedValue:to:): don't add the value if nil diff --git a/SOPE/NGCards/iCalPerson.m b/SOPE/NGCards/iCalPerson.m index 449c1b012..9fc728e02 100644 --- a/SOPE/NGCards/iCalPerson.m +++ b/SOPE/NGCards/iCalPerson.m @@ -247,8 +247,8 @@ /* comparison */ -- (unsigned)hash { - if([self email]) +- (NSUInteger) hash { + if ([self email]) return [[self email] hash]; return [super hash]; } diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index 969990ee3..052d93065 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -151,7 +151,7 @@ [currentStartDate compare: endDate] == NSOrderedSame) { BOOL isRecurrence = NO; - int days, week; + NSInteger days, week; if (repeatCount > 0 || [startDate compare: currentStartDate] == NSOrderedAscending || @@ -166,7 +166,7 @@ } else { - [currentStartDate years:NULL months:NULL days:(int *)&days hours:NULL + [currentStartDate years:NULL months:NULL days:&days hours:NULL minutes:NULL seconds:NULL sinceDate: firStart]; // The following adjustment always set the first day of the