Monotone-Parent: a02d7acbde3aa1019073525f5b106dac9819e84e

Monotone-Revision: bdf65f02baa631ebd76f9f0287be848a1cfef6c6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-02-18T19:37:08
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-02-18 19:37:08 +00:00
parent 7e70e80e66
commit 9cced0c472
2 changed files with 16 additions and 3 deletions
+7
View File
@@ -1,5 +1,12 @@
2010-02-18 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Appointments/SOGoCalendarComponent.m
(-sendEMailUsingTemplateNamed:forObject:previousObject:toAttendees:):
added a few headers to the ical attachment that could help
work-around bugs occurring with Outlook: content-disposition =
inline, content-transfer-encoding = qp. Moreover a \r\n is added
to the iCalString.
* SoObjects/SOGo/SOGoCache.m: worked around in bug in GCC
occurring with libmemcached >= 0.37 by making the servers and
handle ivars static globals.
@@ -649,7 +649,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
toAttendees: (NSArray *) attendees
{
NSString *pageName;
NSString *senderEmail, *shortSenderEmail, *email, *iCalString;
NSString *senderEmail, *shortSenderEmail, *email, *versitString, *iCalString;
WOApplication *app;
unsigned i, count;
iCalPerson *attendee;
@@ -681,7 +681,8 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
// NSLog (@"sending '%@' from %@",
// [(iCalCalendar *) [object parent] method], senderEmail);
/* generate iCalString once */
iCalString = [[object parent] versitString];
versitString = [[object parent] versitString];
iCalString = [NSString stringWithFormat: @"%@\r\n", versitString];
/* get WOApplication instance */
app = [WOApplication application];
@@ -760,8 +761,13 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, NSStr
[(iCalCalendar *) [object parent] method]];
headerMap = [NGMutableHashMap hashMapWithCapacity: 1];
[headerMap setObject:header forKey: @"content-type"];
[headerMap setObject: @"inline"
forKey: @"content-disposition"];
[headerMap setObject: @"quoted-printable"
forKey: @"content-transfer-encoding"];
bodyPart = [NGMimeBodyPart bodyPartWithHeader: headerMap];
[bodyPart setBody: [iCalString dataUsingEncoding: NSUTF8StringEncoding]];
[bodyPart setBody: [[iCalString dataUsingEncoding: NSUTF8StringEncoding]
dataByEncodingQuotedPrintable]];
/* attach calendar part to multipart body */
[body addBodyPart: bodyPart];