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

Monotone-Parent: 5f859ec68ac3088a6a1a60e1cf887c3208974571 

Monotone-Revision: 2434c6ad1961a254ac8fb9c01f787ace6e863ae3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-02-14T23:43:05
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-02-14 23:43:05 +00:00
parent 4d24b2fc4d
commit 1b3dbb4be0
2 changed files with 48 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2011-02-14 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreContext.m
(-createMessagePropertiesWithMID:inFID:isAssociated:): create a
fake PR_SEARCH_KEY on new message to make Outlook happy when
composing invitations.
(-getProperties:ofTableType:inRow:withMID:): perform property
searches on "live messages" (unsaved ones) as well.
* OpenChange/MAPIStoreMailMessageTable.m (-restrictedChildKeys):
no longer excluded messages marked with "\Deleted".
(-getChildProperty:forKey:withTag:): display the right icon for

43
OpenChange/MAPIStoreContext.m
View File

@ -46,6 +46,7 @@
#import "MAPIStoreMapping.h"
#import "MAPIStoreTypes.h"
#import "NSArray+MAPIStore.h"
#import "NSObject+MAPIStore.h"
#import "NSString+MAPIStore.h"
#import "MAPIStoreContext.h"
@ -901,7 +902,13 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
forKey: @"associated"];
[messageProperties setObject: [NSNumber numberWithInt: 1]
forKey: @"mapiRetainCount"];
[messageProperties
setObject: [@"No subject" dataUsingEncoding: NSASCIIStringEncoding]
forKey: MAPIPropertyKey (PR_SEARCH_KEY)];
[messages setObject: messageProperties forKey: midNbr];
[messageProperties release];
}
@ -1056,8 +1063,10 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
NSArray *children;
NSString *childURL, *folderURL, *childKey;
NSInteger count;
NSDictionary *messageProperties;
void *propValue;
uint64_t fid;
id valueObject;
const char *propName;
enum MAPITAGS tag;
enum MAPISTATUS propRc;
@ -1124,8 +1133,38 @@ _prepareContextClass (struct mapistore_context *newMemCtx,
}
else
{
[self errorWithFormat: @"No url found for FMID: %lld", fmid];
rc = MAPI_E_INVALID_OBJECT;
messageProperties = [messages objectForKey:
[NSNumber numberWithUnsignedLongLong: fmid]];
if (messageProperties)
{
aRow->lpProps = talloc_array (aRow, struct SPropValue,
sPropTagArray->cValues);
aRow->cValues = sPropTagArray->cValues;
for (count = 0; count < sPropTagArray->cValues; count++)
{
tag = sPropTagArray->aulPropTag[count];
valueObject
= [messageProperties objectForKey: MAPIPropertyKey (tag)];
if (valueObject)
propRc = [valueObject getMAPIValue: &propValue
forTag: tag
inMemCtx: memCtx];
else
{
propValue = MAPILongValue (memCtx, MAPI_E_NOT_FOUND);
tag = (tag & 0xffff0000) | 0x000a;
}
set_SPropValue_proptag (aRow->lpProps + count, tag, propValue);
}
rc = MAPI_E_SUCCESS;
}
else
{
[self errorWithFormat: @"No url found for FMID: %lld", fmid];
rc = MAPI_E_INVALID_OBJECT;
}
}
return rc;