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

Monotone-Parent: da9c14ddfb4c9a9c929c7b84543af4ce664cfc10

Browse Source 
Monotone-Revision: 829ccf73000a2d91a5daf67741479e395011b6a8

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-26T20:13:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-07-26 20:13:10 +00:00
parent b95cd69e4b
commit aad817d5ca
19 changed files with 307 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
OpenChange/MAPIStoreMailMessage.m
View File

@@ -104,7 +104,6 @@ static Class NSExceptionK, MAPIStoreSentItemsFolderK, MAPIStoreDraftsFolderK;
headerSetup = NO;
bodyContent = nil;
bodySetup = NO;
fetchedAttachments = NO;
appointmentWrapper = nil;
}
@@ -444,8 +443,8 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
v |= MSGFLAG_FROMME;
if ([flags containsObject: @"seen"])
v |= MSGFLAG_READ;
if ([[self childKeysMatchingQualifier: nil
andSortOrderings: nil] count] > 0)
if ([[self attachmentKeys]
count] > 0)
v |= MSGFLAG_HASATTACH;
*data = MAPILongValue (memCtx, v);
@@ -1122,7 +1121,6 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
keyPrefix = @"0";
[attachmentParts setObject: bodyInfo
forKey: keyPrefix];
[attachmentKeys addObject: keyPrefix];
}
else
{
@@ -1137,18 +1135,14 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
}
}
- (NSArray *) childKeysMatchingQualifier: (EOQualifier *) qualifier
andSortOrderings: (NSArray *) sortOrderings
- (NSArray *) attachmentsKeysMatchingQualifier: (EOQualifier *) qualifier
andSortOrderings: (NSArray *) sortOrderings
{
if (!fetchedAttachments)
{
[self _fetchAttachmentPartsInBodyInfo: [sogoObject bodyStructure]
withPrefix: @""];
fetchedAttachments = YES;
}
[self _fetchAttachmentPartsInBodyInfo: [sogoObject bodyStructure]
withPrefix: @""];
return [super childKeysMatchingQualifier: qualifier
andSortOrderings: sortOrderings];
return [super attachmentKeysMatchingQualifier: qualifier
andSortOrderings: sortOrderings];
}
- (id) lookupAttachment: (NSString *) childKey
@@ -1186,7 +1180,7 @@ _compareBodyKeysByPriority (id entry1, id entry2, void *data)
mapiStoreObjectWithSOGoObject: currentPart
inContainer: self];
[attachment setBodyInfo: [attachmentParts objectForKey: childKey]];
[attachment setAID: [attachmentKeys indexOfObject: childKey]];
[attachment setAID: [[self attachmentKeys] indexOfObject: childKey]];
}
}