From 5722856993d606edbb92b82235942720fa88f5f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 6 Aug 2012 19:16:46 +0000
Subject: [PATCH] Monotone-Parent: a797dc8fdc5b4a9a938cb4ecf4b99bda3e239fb7
 Monotone-Revision: 08f69e80d11df21083547348b4136cf77bdb5a78

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-08-06T19:16:46
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  5 +++++
 OpenChange/MAPIStoreSOGoObject.m | 13 +------------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a30e40848..8c00429f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
diff --git a/OpenChange/MAPIStoreSOGoObject.m b/OpenChange/MAPIStoreSOGoObject.m
index 421337505..f6d849857 100644
--- a/OpenChange/MAPIStoreSOGoObject.m
+++ b/OpenChange/MAPIStoreSOGoObject.m
@@ -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 */