From 415a01b20ba622ca80378595e53db1c184cf0227 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 30 Dec 2010 14:46:04 +0000 Subject: [PATCH] Monotone-Parent: eebb10325c95cf3524a8521ef34f3a6f10e91cf7 Monotone-Revision: a92e511f060bf8edffe8e0c8bfe66d20ee35d18e Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-12-30T14:46:04 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 +++++++- OpenChange/MAPIStoreOutboxContext.m | 31 +++-------------------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8336bbd2d..6d43eae25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,13 @@ 2010-12-30 Wolfgang Sourdeau + * OpenChange/MAPIStoreContext.m + (-createMessageOfClass:inFolderAtURL:): renamed from + "-createMessageInFolder:", taking an additional message class + parameter that enables the subclasses to accept or deny a message + creation. + * OpenChange/EOQualifier+MAPIFS.m (-evaluateMAPIFSMessage:): added - logging for debugging. + logging for easier debugging. * OpenChange/MAPIStoreSentItemsContext.[hm]: class is now derived from MAPIStoreMailContext and set up its module folder to the diff --git a/OpenChange/MAPIStoreOutboxContext.m b/OpenChange/MAPIStoreOutboxContext.m index 3ca57132d..bb8dafd78 100644 --- a/OpenChange/MAPIStoreOutboxContext.m +++ b/OpenChange/MAPIStoreOutboxContext.m @@ -24,18 +24,13 @@ #import -#import - #import #import -#import +#import #import "MAPIApplication.h" #import "MAPIStoreAuthenticator.h" #import "MAPIStoreMapping.h" -#import "MAPIStoreTypes.h" - -#import "NSData+MAPIStore.h" #import "MAPIStoreOutboxContext.h" @@ -86,30 +81,10 @@ } } -- (id) createMessageInFolder: (id) parentFolder +- (id) createMessageOfClass: (NSString *) messageClass + inFolderAtURL: (NSString *) folderURL; { return [moduleFolder newDraft]; } -- (enum MAPISTATUS) getMessageTableChildproperty: (void **) data - atURL: (NSString *) childURL - withTag: (enum MAPITAGS) proptag - inFolder: (SOGoFolder *) folder - withFID: (uint64_t) fid -{ - enum MAPISTATUS rc; - - if (proptag == PR_CHANGE_KEY) - { - *data = [[@"openchangedraft" dataUsingEncoding: NSASCIIStringEncoding] - asShortBinaryInMemCtx: memCtx]; - rc = MAPI_E_SUCCESS; - } - else - rc = [super getMessageTableChildproperty: data atURL: childURL withTag: - proptag inFolder: folder withFID: fid]; - - return rc; -} - @end