Monotone-Parent: a797dc8fdc5b4a9a938cb4ecf4b99bda3e239fb7

Monotone-Revision: 08f69e80d11df21083547348b4136cf77bdb5a78

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-06T19:16:46
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2012-08-06 19:16:46 +00:00
parent 7d12d795be
commit 5722856993
2 changed files with 6 additions and 12 deletions

View File

@ -1,3 +1,8 @@
2012-08-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* OpenChange/MAPIStoreSOGoObject.m (-objectId): force generation
of objectId by parent, whether it is a folder or not.
2012-08-03 Jean Raby <jraby@inverse.ca>
* SoObjects/SOGo/LDAPSource.m (changePasswordForLogin):

View File

@ -132,18 +132,7 @@ static Class MAPIStoreFolderK;
/* helpers */
- (uint64_t) objectId
{
uint64_t objectId;
if ([container isKindOfClass: MAPIStoreFolderK])
objectId = [(MAPIStoreFolder *) container
idForObjectWithKey: [sogoObject nameInContainer]];
else
{
[self errorWithFormat: @"%s: container is not a folder", __PRETTY_FUNCTION__];
objectId = (uint64_t) -1;
}
return objectId;
return [container idForObjectWithKey: [sogoObject nameInContainer]];
}
/* getters */