From 58ad3eaa7db7991f2352c39dfa792f3cc2338b22 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 24 Jan 2012 05:53:55 +0000 Subject: [PATCH 1/3] Monotone-Parent: ecc0c907192778ee08a07fb020aa037de83d7bed Monotone-Revision: 61296b2807f18b0b48ad4d06689b71ad8563e335 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-01-24T05:53:55 --- UI/Scheduler/UIxCalListingActions.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/Scheduler/UIxCalListingActions.m b/UI/Scheduler/UIxCalListingActions.m index f75a38cf8..4b4a956c4 100644 --- a/UI/Scheduler/UIxCalListingActions.m +++ b/UI/Scheduler/UIxCalListingActions.m @@ -745,7 +745,7 @@ _userStateInEvent (NSArray *event) [currentDay addObject: eventBlock]; } else - [self warnWithFormat: @"event '%@' has end < start: %d < %d", + [self warnWithFormat: @"event '%@' has end <= start: %d < %d", [event objectAtIndex: eventNameIndex], eventEnd, currentStart]; } } From 40ba66330cb7083892ec4a95800526c7ddef58db Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 24 Jan 2012 14:05:53 +0000 Subject: [PATCH 2/3] See ChangeLog. Monotone-Parent: 61296b2807f18b0b48ad4d06689b71ad8563e335 Monotone-Revision: d56dcfcfa2ad9eaeb548182071e486328b8a3cce Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2012-01-24T14:05:53 --- ChangeLog | 5 +++++ NEWS | 1 + UI/Scheduler/UIxCalFolderActions.m | 3 +++ 3 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 9f8d8b7c7..586fefd00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-01-24 Francis Lachapelle + + * UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to + latin-1 when utf-8 decoding doesn't work. + 2012-01-19 Francis Lachapelle * UI/WebServerResources/UIxMailToSelection.js diff --git a/NEWS b/NEWS index dd09826b0..538b59e98 100644 --- a/NEWS +++ b/NEWS @@ -9,6 +9,7 @@ Enhancements - updated Ukrainian translation - now possible to use memcached over a UNIX socket - increase size of content columns + - improved import of .ics files Bug Fixes - alarms for tasks now depend on the start date and instead of the due date diff --git a/UI/Scheduler/UIxCalFolderActions.m b/UI/Scheduler/UIxCalFolderActions.m index 75a8c6a68..abe0b3400 100644 --- a/UI/Scheduler/UIxCalFolderActions.m +++ b/UI/Scheduler/UIxCalFolderActions.m @@ -72,6 +72,9 @@ { fileContent = [[NSString alloc] initWithData: (NSData *) data encoding: NSUTF8StringEncoding]; + if (fileContent == nil) + fileContent = [[NSString alloc] initWithData: (NSData *) data + encoding: NSISOLatin1StringEncoding]; [fileContent autorelease]; } From 222f0fe21e072a70068f7e4ee31c73f36a8db6f6 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Wed, 25 Jan 2012 20:26:30 +0000 Subject: [PATCH 3/3] See ChangeLog Monotone-Parent: d56dcfcfa2ad9eaeb548182071e486328b8a3cce Monotone-Revision: f66f0fe4d0c10d1b3986e47a08b0ce8c08736f3c Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2012-01-25T20:26:30 --- ChangeLog | 6 ++++++ SOPE/GDLContentStore/GCSFolder.m | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 586fefd00..597d2403b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-01-25 Ludovic Marcotte + + * SOPE/GDLContentStore/GCSFolder.m - we now use the proper + method to determine column types, avoiding the generation + of broken UPDATE statements on MySQL when snoozing alarms. + 2012-01-24 Francis Lachapelle * UI/Scheduler/UIxCalFolderActions.m (-importAction): failback to diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 51a931f7f..8361ca683 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -832,7 +832,7 @@ andAttribute: (EOAttribute *)_attribute EOSQLQualifier *qualifier; EOAttribute *attribute1, *attribute2; - attribute1 = [_entity attributeNamed: _colname]; + attribute1 = [self _attributeForColumn: _colname]; if (_colname2 == nil) { qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity @@ -842,7 +842,7 @@ andAttribute: (EOAttribute *)_attribute } else { - attribute2 = [_entity attributeNamed: _colname2]; + attribute2 = [self _attributeForColumn: _colname2]; qualifier = [[EOSQLQualifier alloc] initWithEntity: _entity qualifierFormat: @"%A = %@ AND %A = %@", _colname,