From b52ed7db1d0e7186a7c8c55bc800135d2d6bf309 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Fri, 24 Aug 2007 20:38:36 +0000 Subject: [PATCH] Monotone-Parent: e0d6bca914a4da0940a671160d74b221a1596487 Monotone-Revision: 2b72439bcc17ba4d9a4c37701d8a818e14887487 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-08-24T20:38:36 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 4 ++++ SoObjects/Appointments/SOGoAppointmentFolder.m | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index db41b9ec3..6c30d788f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2007-08-24 Wolfgang Sourdeau + * SoObjects/Appointments/SOGoAppointmentFolder.m + ([SOGoAppointmentFolder -lookupCalendarFolderForUID:uid]): add + "personal" to the ocs path of the appointment folder. + * UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer -flatContentAsString]): use latin1 when the encoding is not specified, and to reencode data chunk which were not correctly diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index a5314d019..9fa1695fc 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1029,7 +1029,7 @@ static NSNumber *sharedYes = nil; calendarFolder = [SOGoAppointmentFolder objectWithName: @"Calendar" inContainer: userFolder]; [calendarFolder - setOCSPath: [NSString stringWithFormat: @"/Users/%@/Calendar", uid]]; + setOCSPath: [NSString stringWithFormat: @"/Users/%@/Calendar/personal", uid]]; [calendarFolder setOwner: uid]; return calendarFolder; @@ -1303,9 +1303,11 @@ static NSNumber *sharedYes = nil; NSMutableArray *newPath; newPath = [NSMutableArray arrayWithArray: objectPath]; - if ([newPath count] > 2 - && ![[newPath objectAtIndex: 2] isEqualToString: @"personal"]) - [newPath insertObject: @"personal" atIndex: 2]; + if ([newPath count] > 2) + { + if (![[newPath objectAtIndex: 2] isEqualToString: @"personal"]) + [newPath insertObject: @"personal" atIndex: 2]; + } else [newPath addObject: @"personal"];