amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-07 22:38:51 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: cf8c187bd6389eaf744f04cbf46806573f18fc89

Browse Source 
Monotone-Revision: 657b65bbc6a703b12a62acd946bafae499c520b1

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-15T03:23:15
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-05-15 03:23:15 +00:00
parent 68aadd5f7f
commit bbae929c4f
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -1,5 +1,10 @@
2007-05-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoDraftObject.m ([NSString
-asQPSubjectString:encoding]): simplified method.
The headers indicates "utf-8" again thank to our fix in
sope-mime.
* SoObjects/SOGo/SOGoObject.m: fail to build if libFoundation is
being used.

25
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -35,7 +35,7 @@
#include <NGExtensions/NSFileManager+Extensions.h>
#include "common.h"
static NSString *contentTypeValue = @"text/plain; charset=iso-8859-1";
static NSString *contentTypeValue = @"text/plain; charset=utf-8";
@interface NSString (NGMimeHelpers)
@@ -48,23 +48,16 @@ static NSString *contentTypeValue = @"text/plain; charset=iso-8859-1";
- (NSString *) asQPSubjectString: (NSString *) encoding;
{
NSString *qpString;
unsigned char *data, *dest;
unsigned int dataLen, destLen;
NSData *subjectData, *destSubjectData;
dataLen = [self length];
data = calloc(dataLen, sizeof (unsigned char*));
[self getCString: (char *) data];
subjectData = [self dataUsingEncoding: NSUTF8StringEncoding];
destSubjectData = [subjectData dataByEncodingQuotedPrintable];
destLen = dataLen * 3;
dest = calloc(dataLen * 3, sizeof (unsigned char*));
NGEncodeQuotedPrintableMime (data, dataLen, dest, destLen);
qpString = [[NSString alloc] initWithData: destSubjectData
encoding: NSASCIIStringEncoding];
[qpString autorelease];
qpString = [NSString stringWithFormat: @"=?%@?Q?%s?=", encoding, dest];
free (data);
free (dest);
return qpString;
return [NSString stringWithFormat: @"=?%@?Q?%@?=", encoding, qpString];
}
@end
@@ -659,7 +652,7 @@ static NSString *fromInternetSuffixPattern = nil;
/* add subject */
if ([(s = [lInfo objectForKey:@"subject"]) length] > 0)
[map setObject: [s asQPSubjectString: @"iso-8859-1"]
[map setObject: [s asQPSubjectString: @"utf-8"]
forKey:@"subject"];
// [map setObject: [s asQPSubjectString: @"utf-8"] forKey:@"subject"];