LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Monotone-Parent: 42b9d80ac08dee2bf98006223a87c3a37a8ace44

Browse source 
Monotone-Revision: ba9e6391ee9c1e0fe0680835dcc1e917cea277fb

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-10-30T17:07:39
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-10-30 17:07:39 +00:00
parent b7685686a4
commit de698e6a1a
1 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
SoObjects/Mailer/SOGoMailObject.m
View file

@ -398,11 +398,11 @@ static BOOL debugSoParts = NO;
NSData *content;
id result, fullResult;
fullResult = [self fetchParts:[NSArray arrayWithObject: @"RFC822"]];
fullResult = [self fetchParts: [NSArray arrayWithObject: @"RFC822"]];
if (fullResult == nil)
return nil;
if ([fullResult isKindOfClass:[NSException class]])
if ([fullResult isKindOfClass: [NSException class]])
return fullResult;
/* extract fetch result */
@ -440,23 +440,30 @@ static BOOL debugSoParts = NO;
- (NSString *) contentAsString
{
NSString *s;
id s;
NSData *content;
if ((content = [self content]) == nil)
return nil;
if ([content isKindOfClass:[NSException class]])
return (id)content;
s = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
if (s == nil) {
[self logWithFormat:
@"ERROR: could not convert data of length %d to string",
[content length]];
return nil;
}
return [s autorelease];
content = [self content];
if (content)
{
if ([content isKindOfClass: [NSData class]])
{
s = [[NSString alloc] initWithData: content
encoding: NSISOLatin1StringEncoding];
if (s)
[s autorelease];
else
[self logWithFormat:
@"ERROR: could not convert data of length %d to string",
[content length]];
}
else
s = content;
}
else
s = nil;
return s;
}
/* bulk fetching of plain/text content */