merge of '397fde917fae54c68a56446340e43b77444b00e1'

and 'e9584ae6fb22159a5f2cace0641d3a58c6816280'

Monotone-Parent: 397fde917fae54c68a56446340e43b77444b00e1
Monotone-Parent: e9584ae6fb22159a5f2cace0641d3a58c6816280
Monotone-Revision: 748fb7eea98a07ee1396f6902a6b0fb3e52f280e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-21T15:09:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-11-21 15:09:33 +00:00
4 changed files with 30 additions and 15 deletions
+7 -3
View File
@@ -117,10 +117,14 @@ static BOOL showNamedTextAttachmentsInline = NO;
- (NSData *) flatContentForPartPath: (NSArray *) _partPath
{
NSString *pid;
pid = _partPath ? [_partPath componentsJoinedByString:@"."] : @"";
NSData *content;
return [[self flatContents] objectForKey:pid];
pid = _partPath ? [_partPath componentsJoinedByString: @"."] : @"";
content = [[self flatContents] objectForKey: pid];
if (!content && ![pid intValue])
content = [flatContents objectForKey: @""];
return content;
}
/* viewer components */