Monotone-Parent: a1f0f7f1bc0ae64c5342d0d87ffd1ff8e7e3272c

Monotone-Revision: 4ce6162defbc430cacd1a414c9d9b8a3d7e9940e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-10-28T13:10:47
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-10-28 13:10:47 +00:00
parent 8329414509
commit 1ba0d4daa1
7 changed files with 71 additions and 98 deletions

View File

@@ -239,12 +239,10 @@ static NSCharacterSet *hexCharacterSet = nil;
{
mgr = [SOGoUserManager sharedUserManager];
msgData->recipients_count = max + 1;
msgData->recipients = talloc_array (msgData, struct mapistore_message_recipient *, max + 1);
msgData->recipients = talloc_array (msgData, struct mapistore_message_recipient, max + 1);
for (count = 0; count < max; count++)
{
msgData->recipients[count]
= talloc_zero (msgData, struct mapistore_message_recipient);
recipient = msgData->recipients[count];
recipient = msgData->recipients + count;
person = [attendees objectAtIndex: count];
cn = [person cn];
@@ -260,7 +258,10 @@ static NSCharacterSet *hexCharacterSet = nil;
entryId = MAPIStoreInternalEntryId (username);
}
else
entryId = MAPIStoreExternalEntryId (cn, email);
{
recipient->username = NULL;
entryId = MAPIStoreExternalEntryId (cn, email);
}
recipient->type = MAPI_TO;
/* properties */
@@ -344,9 +345,7 @@ static NSCharacterSet *hexCharacterSet = nil;
/* On with the organizer: */
{
msgData->recipients[max]
= talloc_zero (msgData, struct mapistore_message_recipient);
recipient = msgData->recipients[max];
recipient = msgData->recipients + max;
person = [event organizer];
cn = [person cn];
@@ -360,7 +359,10 @@ static NSCharacterSet *hexCharacterSet = nil;
entryId = MAPIStoreInternalEntryId (username);
}
else
entryId = MAPIStoreExternalEntryId (cn, email);
{
recipient->username = NULL;
entryId = MAPIStoreExternalEntryId (cn, email);
}
recipient->type = MAPI_TO;
p = 0;