LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 0b736cc980075f71e643c2c71341dee25f434fb9 

Monotone-Revision: a1a4f8e01241e22f0964fc0320be28504ae6e68b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-09-06T18:29:08
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-09-06 18:29:08 +00:00
parent 6cc4a7fca4
commit 1d95cdae7c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2012-09-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailContext.m
(+listContextsForUser:withTDBIndexing:inMemCtx:): we escape the
url string of non-ascii folder names.
* OpenChange/MAPIStoreMailVolatileMessage.m
(FillMessageHeadersFromProperties): build a recipient list for the
"from" field from the list stored in the value for "orig" in the

10
OpenChange/MAPIStoreCalendarMessage.m
View File

@ -210,12 +210,12 @@ static Class NSArrayK;
- (int) getPidTagMessageClass: (void **) data
inMemCtx: (TALLOC_CTX *) memCtx
{
SOGoUser *owner;
// SOGoUser *owner;
owner = [[self userContext] sogoUser];
if ([masterEvent userAsAttendee: owner])
*data = talloc_strdup (memCtx, "IPM.Schedule.Meeting.Request");
else
// owner = [[self userContext] sogoUser];
// if ([masterEvent userAsAttendee: owner])
// *data = talloc_strdup (memCtx, "IPM.Schedule.Meeting.Request");
// else
*data = talloc_strdup (memCtx, "IPM.Appointment");
return MAPISTORE_SUCCESS;

5
OpenChange/MAPIStoreMailContext.m
View File

@ -130,7 +130,7 @@ MakeDisplayFolderName (NSString *folderName)
{
context = talloc_zero (memCtx, struct mapistore_contexts_list);
stringData = [NSString stringWithFormat: @"%@%@", urlBase,
folderName[count]];
[folderName[count] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
context->url = [stringData asUnicodeInMemCtx: context];
/* remove "folder" prefix */
stringData = MakeDisplayFolderName (folderName[count]);
@ -153,7 +153,8 @@ MakeDisplayFolderName (NSString *folderName)
{
context = talloc_zero (memCtx, struct mapistore_contexts_list);
currentName = [secondaryFolders objectAtIndex: count];
stringData = [NSString stringWithFormat: @"%@%@", urlBase, currentName];
stringData = [NSString stringWithFormat: @"%@%@",
urlBase, [currentName stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]];
context->url = [stringData asUnicodeInMemCtx: context];
stringData = [[currentName substringFromIndex: 6] fromCSSIdentifier];
context->name = [stringData asUnicodeInMemCtx: context];