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

Monotone-Parent: 3f8608c82d9c379cc9e0fea6ffe853cc1949a24b

Browse Source 
Monotone-Revision: 905276f295d6f28a6946297f6a7af9ad60f71842

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-06-29T17:59:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2012-06-29 17:59:38 +00:00
parent 591306481b
commit 95a443d89a
67 changed files with 2606 additions and 1873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenChange/MAPIStoreMessage.m
View File

@@ -36,6 +36,7 @@
#import "MAPIStoreAttachmentTable.h"
#import "MAPIStoreContext.h"
#import "MAPIStoreFolder.h"
#import "MAPIStoreMessageTable.h"
#import "MAPIStorePropertySelectors.h"
#import "MAPIStoreSamDBUtils.h"
#import "MAPIStoreTypes.h"
@@ -116,7 +117,6 @@ rtf2html (NSData *compressedRTF)
@interface SOGoObject (MAPIStoreProtocol)
- (NSString *) davEntityTag;
- (NSString *) davContentLength;
@end
@@ -304,6 +304,7 @@ rtf2html (NSData *compressedRTF)
NSData *htmlData, *rtfData;
static NSNumber *htmlKey = nil, *rtfKey = nil;
/* we intercept any RTF content and convert it to HTML */
[super addProperties: newNewProperties];
if (!htmlKey)
@@ -339,10 +340,8 @@ rtf2html (NSData *compressedRTF)
newAid = [[self attachmentKeys] count];
newAttachment = [MAPIStoreAttachment
mapiStoreObjectWithSOGoObject: nil
inContainer: self];
[newAttachment setIsNew: YES];
newAttachment = [MAPIStoreAttachment mapiStoreObjectInContainer: self];
// [newAttachment setIsNew: YES];
[newAttachment setAID: newAid];
newKey = [NSString stringWithFormat: @"%ul", newAid];
[attachmentParts setObject: newAttachment
@@ -497,7 +496,6 @@ rtf2html (NSData *compressedRTF)
[[containerTables objectAtIndex: count]
notifyChangesForChild: self];
[self setIsNew: NO];
[properties removeAllObjects];
[container cleanupCaches];
rc = MAPISTORE_SUCCESS;
}
@@ -792,7 +790,7 @@ rtf2html (NSData *compressedRTF)
- (int) getPidTagOriginalMessageClass: (void **) data
inMemCtx: (TALLOC_CTX *) memCtx
{
return [self getPidTagMessageClass: data inMemCtx: memCtx];
return [self getProperty: data withTag: PidTagMessageClass inMemCtx: memCtx];
}
- (int) getPidTagHasAttachments: (void **) data