Monotone-Parent: e0d6bca914a4da0940a671160d74b221a1596487

Monotone-Revision: 2b72439bcc17ba4d9a4c37701d8a818e14887487

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-24T20:38:36
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-08-24 20:38:36 +00:00
parent 32a6330a97
commit b52ed7db1d
2 changed files with 10 additions and 4 deletions

View File

@@ -1,5 +1,9 @@
2007-08-24 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* 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

View File

@@ -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"];