From 40ba66330cb7083892ec4a95800526c7ddef58db Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Tue, 24 Jan 2012 14:05:53 +0000 Subject: [PATCH] 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]; }