From b183005d916602715e351767435ab8b0cfd64cd5 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 31 Mar 2011 22:07:31 +0000
Subject: [PATCH] Monotone-Parent: ca89b4b4aa3ed9d74f2eb1ed5db3dfbf7f5e596c
 Monotone-Revision: a9072cd7d0f5ae2f518d97ee46191e500e87beea

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-31T22:07:31
Monotone-Branch: ca.inverse.sogo
---
 OpenChange/MAPIStoreMailAttachment.m | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/OpenChange/MAPIStoreMailAttachment.m b/OpenChange/MAPIStoreMailAttachment.m
index 0f0106c8a..8c43085dd 100644
--- a/OpenChange/MAPIStoreMailAttachment.m
+++ b/OpenChange/MAPIStoreMailAttachment.m
@@ -70,8 +70,6 @@
 - (int) getProperty: (void **) data
             withTag: (enum MAPITAGS) propTag
 {
-  static char tagBytes[] = {0x2a, 0x86, 0x48, 0x86, 0xf7, 0x14, 0x03, 0x0a,
-                            0x04}; /* MIME */
   static char recordBytes[] = {0xd9, 0xd8, 0x11, 0xa3, 0xe2, 0x90, 0x18, 0x41,
                                0x9e, 0x04, 0x58, 0x46, 0x9d, 0x6d, 0x1b, 0x68};
   uint32_t longValue;
@@ -83,17 +81,11 @@
   rc = MAPISTORE_SUCCESS;
   switch (propTag)
     {
-    case PR_MID:
-      *data = MAPILongLongValue (memCtx, [container objectId]);
-      break;
-    case PR_ATTACH_NUM:
-      *data = MAPILongValue (memCtx, aid);
-      break;
     case PR_ATTACH_METHOD:
-      *data = MAPILongValue (memCtx, 1);
+      *data = MAPILongValue (memCtx, 0x00000001); // afByValue
       break;
     case PR_ATTACH_TAG:
-      *data = [[NSData dataWithBytes: tagBytes length: 9]
+      *data = [[self mimeAttachTag]
 		asShortBinaryInMemCtx: memCtx];
       break;
     case PR_ATTACH_SIZE:
@@ -101,10 +93,6 @@
       *data = MAPILongValue (memCtx, longValue);
       break;
 
-    case PR_RENDERING_POSITION:
-      *data = MAPILongValue (memCtx, 0xffffffff);
-      break;
-
     case PR_RECORD_KEY:
       *data = [[NSData dataWithBytes: recordBytes length: 16]
 		asShortBinaryInMemCtx: memCtx];