Monotone-Parent: 173c16ed57e319da55ef0f43152bfbba829d1119

Monotone-Revision: ea1c783b905b07e028051a8a9d8f7bf4c894b0f2

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-05-31T03:39:36
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreTable.m

@@ -26,6 +26,7 @@
 #import <EOControl/EOQualifier.h>
 
 #import "EOBitmaskQualifier.h"
+#import "MAPIStoreActiveTables.h"
 #import "MAPIStoreObject.h"
 #import "MAPIStoreTypes.h"
 #import "NSData+MAPIStore.h"
@@ -295,19 +296,16 @@ static Class NSDataK, NSStringK;
   if ((self = [self init]))
     {
       container = newContainer;
-      [container addActiveTable: self];
+      [[MAPIStoreActiveTables activeTables] registerTable: self];
     }
 
   return self;
 }
 
-- (void) deactivate
-{
-  [container removeActiveTable: self];
-}
-
 - (void) dealloc
 {
+  if (container)
+    [[MAPIStoreActiveTables activeTables] unregisterTable: self];
   [currentChild release];
   [childKeys release];
   [restrictedChildKeys release];
@@ -315,6 +313,16 @@ static Class NSDataK, NSStringK;
   [super dealloc];
 }
 
+- (id) container
+{
+  return container;
+}
+
+- (uint8_t) tableType
+{
+  return tableType;
+}
+
 - (void) setHandleId: (uint32_t) newHandleId
 {
   handleId = newHandleId;