Monotone-Parent: 3bf968de90811032a5b011cf48b3e8c402aa2425
Monotone-Revision: d6049f3e55fa0ac4385db63c3777aa1d84d5511c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-07-20T14:13:50 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
2d132678cf
commit
e55e89c496
|
@ -1,3 +1,10 @@
|
||||||
|
2012-07-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* OpenChange/MAPIStoreMessage.m (-getPidTagSubject:inMemCtx:): now
|
||||||
|
compute the return value based on PidTagNormalizedSubject and
|
||||||
|
PidTagSubjectPrefix as PidTagSubject is never actually set from
|
||||||
|
the client.
|
||||||
|
|
||||||
2012-07-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2012-07-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* OpenChange/MAPIStoreObject.m (-nameInContainer): moved method
|
* OpenChange/MAPIStoreObject.m (-nameInContainer): moved method
|
||||||
|
|
|
@ -706,21 +706,35 @@ rtf2html (NSData *compressedRTF)
|
||||||
- (int) getPidTagSubject: (void **) data
|
- (int) getPidTagSubject: (void **) data
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
{
|
{
|
||||||
[self subclassResponsibility: _cmd];
|
int rc;
|
||||||
|
TALLOC_CTX *localMemCtx;
|
||||||
|
char *prefix, *normalizedSubject;
|
||||||
|
|
||||||
return MAPISTORE_ERR_NOT_FOUND;
|
localMemCtx = talloc_zero (NULL, TALLOC_CTX);
|
||||||
|
if ([self getProperty: (void **) &prefix
|
||||||
|
withTag: PidTagSubjectPrefix
|
||||||
|
inMemCtx: localMemCtx]
|
||||||
|
!= MAPISTORE_SUCCESS)
|
||||||
|
prefix = "";
|
||||||
|
rc = [self getProperty: (void **) &normalizedSubject
|
||||||
|
withTag: PidTagNormalizedSubject
|
||||||
|
inMemCtx: localMemCtx];
|
||||||
|
if (rc == MAPISTORE_SUCCESS)
|
||||||
|
*data = talloc_asprintf (memCtx, "%s%s", prefix, normalizedSubject);
|
||||||
|
|
||||||
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) getPidTagNormalizedSubject: (void **) data
|
- (int) getPidTagNormalizedSubject: (void **) data
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
{
|
{
|
||||||
return [self getPidTagSubject: data inMemCtx: memCtx];
|
return MAPISTORE_ERR_NOT_FOUND;
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) getPidTagOriginalSubject: (void **) data
|
- (int) getPidTagOriginalSubject: (void **) data
|
||||||
inMemCtx: (TALLOC_CTX *) memCtx
|
inMemCtx: (TALLOC_CTX *) memCtx
|
||||||
{
|
{
|
||||||
return [self getPidTagNormalizedSubject: data inMemCtx: memCtx];
|
return [self getPidTagSubject: data inMemCtx: memCtx];
|
||||||
}
|
}
|
||||||
|
|
||||||
- (int) getPidTagConversationTopic: (void **) data
|
- (int) getPidTagConversationTopic: (void **) data
|
||||||
|
|
Loading…
Reference in a new issue