Monotone-Parent: 6b88d1d42fb21659bd47fc0d1167769d8101775f

Monotone-Revision: 633db895fe1d25a8339861d7d55a062abc56205f

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-05T22:40:46
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-05 22:40:46 +00:00
parent b1b3818459
commit 3505969b3e
2 changed files with 13 additions and 16 deletions
+8 -16
View File
@@ -176,27 +176,19 @@
{
charset = [[bodyInfo objectForKey:@"parameterList"]
objectForKey: @"charset"];
charset = [charset lowercaseString];
if (![charset length]
|| [charset isEqualToString: @"us-ascii"])
if ([charset length])
charset = [charset lowercaseString];
else
charset = @"us-ascii";
s = [NSString stringWithData: content usingEncodingNamed: charset];
if (![s length])
{
/* latin 1 is used as a 8bit fallback charset... but does this
encoding accept any byte from 0 to 255? */
s = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
[s autorelease];
}
else
{
s = [NSString stringWithData: content
usingEncodingNamed: charset];
if (![s length])
{
/* latin 1 is used as a 8bit fallback charset... but does this
encoding accept any byte from 0 to 255? */
s = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
[s autorelease];
}
}
if (!s)
{