Monotone-Parent: ae56889949daaa81cfc557f2e59396ea0a1c9e4b

Monotone-Revision: 031eaa8e565a8e094474a94e380477a15e9642ab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-08-13T19:10:09
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-08-13 19:10:09 +00:00
parent bc6bbafd3c
commit a09c000e72
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2011-08-13 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/Mailer/SOGoMailFolder.m
(-lookupName:inContext:acquire:): fixed a crash occurring when the
key didn't end with ".eml".
2011-08-12 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreMailMessageTable.m

View File

@ -295,6 +295,8 @@ static NSString *defaultUserID = @"anyone";
keyLength = [key length];
[uids addObject: [key substringToIndex: keyLength - 4]];
}
else
[uids addObject: key];
}
infos = (NSDictionary *) [self fetchUIDs: uids parts: SOGoMailCoreInfoKeys];
@ -740,7 +742,7 @@ static NSString *defaultUserID = @"anyone";
inContext: (id)_ctx
acquire: (BOOL) _acquire
{
NSString *folderName, *fullFolderName, *className, *uid;
NSString *folderName, *fullFolderName, *className;
SOGoMailAccount *mailAccount;
id obj;
@ -778,8 +780,9 @@ static NSString *defaultUserID = @"anyone";
&& [[self imap4Connection] doesMailboxExistAtURL: [self imap4URL]])
{
obj = [SOGoMailObject objectWithName: _key inContainer: self];
uid = [_key substringToIndex: [_key length] - 4];
[obj setCoreInfos: [prefetchedInfos objectForKey: uid]];
if ([_key hasSuffix: @".eml"])
_key = [_key substringToIndex: [_key length] - 4];
[obj setCoreInfos: [prefetchedInfos objectForKey: _key]];
}
}