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

Monotone-Parent: b0613f483a296b882038d9d023bcb71c82d4916e

Browse Source 
Monotone-Revision: 0811b557e4a5f5fb3a026bfc3e9578e656e1d32b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-26T19:02:45
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-07-26 19:02:45 +00:00
parent 21436999e5
commit 287625af3f
12 changed files with 58 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenChange/MAPIStoreFolder.m
View File

@@ -190,6 +190,25 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
MAPIStoreObject *childMessage = nil;
SOGoObject *msgObject;
if (messageKey)
{
msgObject = [sogoObject lookupName: messageKey
inContext: nil
acquire: NO];
if (msgObject && ![msgObject isKindOfClass: NSExceptionK])
childMessage
= [[self messageClass] mapiStoreObjectWithSOGoObject: msgObject
inContainer: self];
}
return childMessage;
}
- (id) lookupFAIMessage: (NSString *) messageKey
{
MAPIStoreObject *childMessage = nil;
SOGoObject *msgObject;
if (messageKey)
{
[self faiMessageKeys];
@@ -202,16 +221,6 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
= [MAPIStoreFAIMessageK mapiStoreObjectWithSOGoObject: msgObject
inContainer: self];
}
else
{
msgObject = [sogoObject lookupName: messageKey
inContext: nil
acquire: NO];
if (msgObject && ![msgObject isKindOfClass: NSExceptionK])
childMessage
= [[self messageClass] mapiStoreObjectWithSOGoObject: msgObject
inContainer: self];
}
}
return childMessage;
@@ -220,7 +229,7 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
- (id) lookupMessageByURL: (NSString *) childURL
{
MAPIStoreObject *foundObject = nil;
NSString *baseURL, *subURL;
NSString *baseURL, *subURL, *key;
NSArray *parts;
NSUInteger partsCount;
@@ -235,7 +244,12 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
parts = [subURL componentsSeparatedByString: @"/"];
partsCount = [parts count];
if (partsCount == 1)
foundObject = [self lookupMessage: [parts objectAtIndex: 0]];
{
key = [parts objectAtIndex: 0];
foundObject = [self lookupFAIMessage: key];
if (!foundObject)
foundObject = [self lookupMessage: key];
}
}
}
@@ -659,11 +673,6 @@ Class NSExceptionK, MAPIStoreFAIMessageK, MAPIStoreMessageTableK, MAPIStoreFAIMe
folderKeys = nil;
}
- (id) lookupChild: (NSString *) childKey
{
return [self lookupMessage: childKey];
}
- (int) getPrParentFid: (void **) data
inMemCtx: (TALLOC_CTX *) memCtx
{