From 5c044411d417ecfc0e3d9a180bea15dd1c53d5dd Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 8 Jul 2011 20:05:50 +0000
Subject: [PATCH] Monotone-Parent: aff0225cae26a70d3ca711bd22d7459655c7f24e
 Monotone-Revision: 39e4d66894e1c585c6ce895bdcf629c4e6c0999e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-07-08T20:05:50
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                     |  3 +++
 OpenChange/MAPIStoreMessage.h |  5 -----
 OpenChange/MAPIStoreMessage.m | 11 -----------
 OpenChange/MAPIStoreObject.h  |  6 ++++++
 OpenChange/MAPIStoreObject.m  | 11 +++++++++++
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cc184aad7..f0c847330 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreObject.m (-setMAPIRetainCount:)
+	(-mapiRetainCount:): moved methods from MAPIStoreMessage.
+
 	* OpenChange/MAPIStoreTable.m
 	(-evaluateContentRestriction:intoQualifier:): temporarily
 	commented out code initializing "operator" as this local var is
diff --git a/OpenChange/MAPIStoreMessage.h b/OpenChange/MAPIStoreMessage.h
index 73af085ab..6c35b27f9 100644
--- a/OpenChange/MAPIStoreMessage.h
+++ b/OpenChange/MAPIStoreMessage.h
@@ -39,13 +39,8 @@
   NSMutableArray *attachmentKeys;
   NSMutableDictionary *attachmentParts;
   NSMutableArray *activeTables;
-  uint32_t mapiRetainCount;
 }
 
-/* HACK: MAPI retain count */
-- (void) setMAPIRetainCount: (uint32_t) newCount;
-- (uint32_t) mapiRetainCount;
-
 - (void) openMessage: (struct mapistore_message *) msg;
 
 /* helper getters */
diff --git a/OpenChange/MAPIStoreMessage.m b/OpenChange/MAPIStoreMessage.m
index e9c0050aa..a1f3b62a5 100644
--- a/OpenChange/MAPIStoreMessage.m
+++ b/OpenChange/MAPIStoreMessage.m
@@ -54,7 +54,6 @@
 {
   if ((self = [super init]))
     {
-      mapiRetainCount = 0;
       attachmentKeys = nil;
       attachmentParts = nil;
       activeTables = [NSMutableArray new];
@@ -71,16 +70,6 @@
   [super dealloc];
 }
 
-- (void) setMAPIRetainCount: (uint32_t) newCount
-{
-  mapiRetainCount = newCount;
-}
-
-- (uint32_t) mapiRetainCount
-{
-  return mapiRetainCount;
-}
-
 - (void) openMessage: (struct mapistore_message *) msg
 {
   static enum MAPITAGS tags[] = { PR_SUBJECT_PREFIX_UNICODE,
diff --git a/OpenChange/MAPIStoreObject.h b/OpenChange/MAPIStoreObject.h
index cdb06cb71..54ee1bcb1 100644
--- a/OpenChange/MAPIStoreObject.h
+++ b/OpenChange/MAPIStoreObject.h
@@ -39,6 +39,8 @@
 {
   const IMP *classGetters;
 
+  uint32_t mapiRetainCount;
+
   NSMutableArray *parentContainersBag;
   MAPIStoreObject *container;
   id sogoObject;
@@ -54,6 +56,10 @@
 - (id) initWithSOGoObject: (id) newSOGoObject
               inContainer: (MAPIStoreObject *) newFolder;
 
+/* HACK: MAPI retain count */
+- (void) setMAPIRetainCount: (uint32_t) newCount;
+- (uint32_t) mapiRetainCount;
+
 - (void) setIsNew: (BOOL) newIsNew;
 - (BOOL) isNew;
 
diff --git a/OpenChange/MAPIStoreObject.m b/OpenChange/MAPIStoreObject.m
index 51aeea09c..78c250449 100644
--- a/OpenChange/MAPIStoreObject.m
+++ b/OpenChange/MAPIStoreObject.m
@@ -95,6 +95,7 @@ static Class NSExceptionK, MAPIStoreFolderK;
 {
   if ((self = [super init]))
     {
+      mapiRetainCount = 0;
       classGetters = (IMP *) MAPIStorePropertyGettersForClass (isa);
       parentContainersBag = [NSMutableArray new];
       container = nil;
@@ -129,6 +130,16 @@ static Class NSExceptionK, MAPIStoreFolderK;
   [super dealloc];
 }
 
+- (void) setMAPIRetainCount: (uint32_t) newCount
+{
+  mapiRetainCount = newCount;
+}
+
+- (uint32_t) mapiRetainCount
+{
+  return mapiRetainCount;
+}
+
 - (void) setIsNew: (BOOL) newIsNew
 {
   isNew = newIsNew;