Monotone-Parent: c852be1d5a70f9aa1ee5a5b4e45b30bd3ef86939

Monotone-Revision: 1ed44d9759e8a5f57b9c55905872081bf8fec785

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-06-03T23:53:30
Monotone-Branch: ca.inverse.sogo

OpenChange/MAPIStoreAttachment.m

@@ -23,6 +23,7 @@
 #import <Foundation/NSData.h>
 
 #import "MAPIStoreAttachment.h"
+#import "MAPIStoreContext.h"
 #import "MAPIStoreMapping.h"
 #import "MAPIStoreMessage.h"
 #import "MAPIStoreTypes.h"
@@ -33,15 +34,8 @@
 #include <mapistore/mapistore.h>
 #include <mapistore/mapistore_errors.h>
 
-static MAPIStoreMapping *mapping;
-
 @implementation MAPIStoreAttachment
 
-+ (void) initialize
-{
-  mapping = [MAPIStoreMapping sharedMapping];
-}
-
 - (void) setAID: (uint32_t) newAID
 {
   aid = newAID;
@@ -102,9 +96,12 @@ static MAPIStoreMapping *mapping;
                    andFlags: (enum OpenEmbeddedMessage_OpenModeFlags) flags
 {
   MAPIStoreAttachmentMessage *attMessage;
+  MAPIStoreMapping *mapping;
 
   memset (mapistoreMsg, 0, sizeof (struct mapistore_message));
 
+  mapping = [[self context] mapping];
+
   attMessage = [self openEmbeddedMessage];
   if (attMessage)
     *mid = [mapping idFromURL: [attMessage url]];