see changelog

Monotone-Parent: 1011e8e7cab7e718b62aa03f637fa6a37349d95c
Monotone-Revision: 06aa9d65ffbfa422bd62686e09571834da68af2f

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2007-11-25T17:26:56
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2007-11-25 17:26:56 +00:00
parent 047010bfa4
commit c08f067ee9
7 changed files with 62 additions and 14 deletions
+10 -6
View File
@@ -659,17 +659,21 @@ static BOOL debugSoParts = NO;
charset = [[_info valueForKey: @"parameterList"] valueForKey: @"charset"];
if (![charset length])
{
s = [[NSString alloc] initWithData: mailData encoding: NSUTF8StringEncoding];
[s autorelease];
s = nil;
}
else
{
s = [NSString stringWithData: mailData usingEncodingNamed: charset];
// If it has failed, we try at least using UTF-8. Normally, this can NOT fail
if (!s)
s = [[[NSString alloc] initWithData: mailData encoding: NSISOLatin1StringEncoding] autorelease];
}
// If it has failed, we try at least using UTF-8. Normally, this can NOT fail.
// Unfortunately, it seems to fail under GNUstep so we try latin1 if that's
// the case
if (!s)
s = [[[NSString alloc] initWithData: mailData encoding: NSUTF8StringEncoding] autorelease];
if (!s)
s = [[[NSString alloc] initWithData: mailData encoding: NSISOLatin1StringEncoding] autorelease];
}
else
s = nil;