LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 7e7946ac70e135f3e208b210455b3238dd36d951 

Monotone-Revision: daae15bcf9e4793ea2109c4e41219071a3e94636

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-30T19:49:58
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2010-08-30 19:49:58 +00:00
parent 629cf8ec10
commit c018b94997
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SOPE/NGCards/ChangeLog
View File

@ -1,3 +1,9 @@
2010-08-30 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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 <flachapelle@inverse.ca> 2010-08-24 Francis Lachapelle <flachapelle@inverse.ca>
* CardElement.m (-setNamedValue:to:): don't add the value if nil * CardElement.m (-setNamedValue:to:): don't add the value if nil

4
SOPE/NGCards/iCalPerson.m
View File

@ -247,8 +247,8 @@
/* comparison */ /* comparison */
- (unsigned)hash { - (NSUInteger) hash {
if([self email]) if ([self email])
return [[self email] hash]; return [[self email] hash];
return [super hash]; return [super hash];
} }

4
SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
View File

@ -151,7 +151,7 @@
[currentStartDate compare: endDate] == NSOrderedSame) [currentStartDate compare: endDate] == NSOrderedSame)
{ {
BOOL isRecurrence = NO; BOOL isRecurrence = NO;
int days, week; NSInteger days, week;
if (repeatCount > 0 || if (repeatCount > 0 ||
[startDate compare: currentStartDate] == NSOrderedAscending || [startDate compare: currentStartDate] == NSOrderedAscending ||
@ -166,7 +166,7 @@
} }
else 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]; minutes:NULL seconds:NULL sinceDate: firStart];
// The following adjustment always set the first day of the // The following adjustment always set the first day of the