From 665d11976afdf99115b1ee227f38fb47a8f32144 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 31 Aug 2012 20:31:33 +0000 Subject: [PATCH 1/3] See ChangeLog Monotone-Parent: 749811709acadced020a19e4ce7c00f07ac86e77 Monotone-Revision: 635c9e7117554059bb6df5357a9f71f448867b55 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-08-31T20:31:33 --- SOPE/NGCards/ChangeLog | 6 ++++++ SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index e5922829f..921859fca 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,9 @@ +2012-08-31 Francis Lachapelle + + * iCalWeeklyRecurrenceCalculator.m + (-recurrenceRangesWithinCalendarDateRange:): the week counter must + start at 0 when there's no day mask. + 2012-08-22 Francis Lachapelle * iCalWeeklyRecurrenceCalculator.m diff --git a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m index 140d05531..ad2812e15 100644 --- a/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m +++ b/SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m @@ -119,10 +119,10 @@ [currentStartDate autorelease]; ranges = [NSMutableArray array]; count = 0; - i = [currentStartDate dayOfWeek]; // Set the first day of the week as Sunday and ignore WKST if (dayMask == nil) { + i = 0; while ([currentStartDate compare: endDate] == NSOrderedAscending || [currentStartDate compare: endDate] == NSOrderedSame) { @@ -147,6 +147,7 @@ { NGCalendarDateRange *r; + i = [currentStartDate dayOfWeek]; // Set the first day of the week as Sunday and ignore WKST while ([currentStartDate compare: endDate] == NSOrderedAscending || [currentStartDate compare: endDate] == NSOrderedSame) { @@ -175,7 +176,7 @@ if (isRecurrence) { - count++; + count++; if (repeatCount > 0 && count > repeatCount) break; currentEndDate = [currentStartDate addTimeInterval: [firstRange duration]]; From 1c128a224f9c62a33cd8374983a0ae06dda4ada4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 4 Sep 2012 17:46:23 +0000 Subject: [PATCH 2/3] See ChangeLog Monotone-Parent: 635c9e7117554059bb6df5357a9f71f448867b55 Monotone-Revision: 31dc3dd102c504ce978c1809310a4924273fc57b Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-09-04T17:46:23 --- ChangeLog | 6 ++++++ SoObjects/SOGo/WORequest+SOGo.m | 30 ++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0899c1fe0..77a3a08d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-09-04 Francis Lachapelle + + * SoObjects/SOGo/WORequest+SOGo.m (-isMacOSXAddressBookApp): + recognize OS X 10.8 useragent. + (-isICal4): idem. + 2012-08-27 Francis Lachapelle * SoObjects/Appointments/SOGoAptMailInvitation.m, diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m index b972f22e2..d554bd5a0 100644 --- a/SoObjects/SOGo/WORequest+SOGo.m +++ b/SoObjects/SOGo/WORequest+SOGo.m @@ -136,21 +136,32 @@ } // -// sogod[22188] -[WEClientCapabilities initWithRequest:]: Unknown WebClient: user-agent='CalendarStore/5.0.1 (1139.14); iCal/5.0.1 (1547.4); Mac OS X/10.7.2 (11C74)' -// +// CalendarStore/5.0.1 (1139.14); iCal/5.0.1 (1547.4); Mac OS X/10.7.2 (11C74) +// CalendarStore/5.0.3 (1204.1); iCal/5.0.3 (1605.3); Mac OS X/10.7.4 (11E53) +// Mac OS X/10.8 (12A269) Calendar/1639 +// Mac OS X/10.8 (12A269) CalendarAgent/47 +// Mac OS X/10.8.1 (12B19) CalendarAgent/47 // - (BOOL) isICal4 { return ([self isAppleDAVWithSubstring: @"iCal/4."] || [self isAppleDAVWithSubstring: @"iCal/5."] - || [self isAppleDAVWithSubstring: @"CoreDAV/"]); + || [self isAppleDAVWithSubstring: @"CoreDAV/"] + || [self isAppleDAVWithSubstring: @"Calendar/"] + || [self isAppleDAVWithSubstring: @"CalendarAgent/"]); } // -// Starting from 10.7, we see something like: +// For 10.7, we see: // -// sogod[27330] -[WEClientCapabilities initWithRequest:]: Unknown WebClient: user-agent='AddressBook/6.1 (1062) CardDAVPlugin/196 CFNetwork/520.2.5 Mac_OS_X/10.7.2 (11C74)' +// AddressBook/6.1 (1062) CardDAVPlugin/196 CFNetwork/520.2.5 Mac_OS_X/10.7.2 (11C74) +// AddressBook/6.1.2 (1090) CardDAVPlugin/200 CFNetwork/520.4.3 Mac_OS_X/10.7.4 (11E53) +// +// For 10.8, we see: +// +// Mac OS X/10.8 (12A269) AddressBook/1143 +// Mac OS X/10.8.1 (12B19) AddressBook/1143 // - (BOOL) isMacOSXAddressBookApp { @@ -159,9 +170,12 @@ cc = [self clientCapabilities]; - b = [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound && - ([[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound || - [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound); + b = [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound + && [[cc userAgent] rangeOfString: @"Darwin"].location != NSNotFound + || ( [[cc userAgent] rangeOfString: @"CFNetwork"].location != NSNotFound + || [[cc userAgent] rangeOfString: @"Mac OS X"].location != NSNotFound ) + && [[cc userAgent] rangeOfString: @"AddressBook"].location != NSNotFound; + return b; } From 82530229ccf743bfbd23b70d5bf8a46df5ecab48 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 4 Sep 2012 17:52:59 +0000 Subject: [PATCH 3/3] Updated NEWS file Monotone-Parent: 31dc3dd102c504ce978c1809310a4924273fc57b Monotone-Revision: 7c7520aa207bce4701e10594a7e6854a244e9f7e Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-09-04T17:52:59 --- NEWS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index b482828bc..8039b8bd2 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +1.3.18a (2012-09-04) +------------------- +Bug Fixes + - fixed display of weekly events with no day mask + - fixed parsing of mail headers + - fixed support for OS X 10.8 (Mounting Lion) + 1.3.18 (2012-08-28) ------------------- Enhancements