[Spambayes-checkins] spambayes/Outlook2000 msgstore.py,1.91,1.92

[Kenny Pitt]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13348/Outlook2000

Modified Files:
	msgstore.py 
Log Message:
Include Message-ID in fake Exchange headers.

Index: msgstore.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/msgstore.py,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** msgstore.py	6 Dec 2004 00:11:31 -0000	1.91
--- msgstore.py	15 Dec 2004 19:46:28 -0000	1.92
***************
*** 29,32 ****
--- 29,33 ----
  MYPR_BODY_HTML_A = 0x1013001e # magic <wink>
  MYPR_BODY_HTML_W = 0x1013001f # ditto
+ MYPR_MESSAGE_ID_A = 0x1035001E # more magic (message id field used for Exchange)
  
  CLEAR_READ_FLAG = 0x00000004
***************
*** 987,991 ****
          prop_ids = PR_SUBJECT_A, PR_DISPLAY_NAME_A, PR_DISPLAY_TO_A, \
                     PR_DISPLAY_CC_A, PR_MESSAGE_DELIVERY_TIME, \
!                    PR_SENDER_NAME_A
          hr, data = self.mapi_object.GetProps(prop_ids,0)
          subject = self._GetPotentiallyLargeStringProp(prop_ids[0], data[0])
--- 988,992 ----
          prop_ids = PR_SUBJECT_A, PR_DISPLAY_NAME_A, PR_DISPLAY_TO_A, \
                     PR_DISPLAY_CC_A, PR_MESSAGE_DELIVERY_TIME, \
!                    PR_SENDER_NAME_A, MYPR_MESSAGE_ID_A
          hr, data = self.mapi_object.GetProps(prop_ids,0)
          subject = self._GetPotentiallyLargeStringProp(prop_ids[0], data[0])
***************
*** 996,999 ****
--- 997,1002 ----
          alt_sender = self._GetPotentiallyLargeStringProp(prop_ids[5],
                                                           data[5])
+         message_id = self._GetPotentiallyLargeStringProp(prop_ids[6],
+                                                          data[6])
          headers = ["X-Exchange-Message: true"]
          if subject:
***************
*** 1007,1010 ****
--- 1010,1015 ----
          if cc:
              headers.append("CC: "+cc)
+         if message_id:
+             headers.append("Message-ID: "+message_id)
          if delivery_time:
              from time import timezone