[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.16,1.17 manager.py,1.19,1.20

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory usw-pr-cvs1:/tmp/cvs-serv11097

Modified Files:
	addin.py manager.py 
Log Message:
Remove the rest of CDO/MAPI - we no longer need this for *anything*


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** addin.py	25 Oct 2002 03:35:09 -0000	1.16
--- addin.py	25 Oct 2002 06:58:20 -0000	1.17
***************
*** 34,38 ****
      gencache.EnsureModule('{00062FFF-0000-0000-C000-000000000046}', 0, 9, 0, bForDemand=True) # Outlook 9
      gencache.EnsureModule('{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}', 0, 2, 1, bForDemand=True) # Office 9
-     gencache.EnsureModule('{3FA7DEA7-6438-101B-ACC1-00AA00423326}', 0, 1, 21, bForDemand = True) # CDO
  
      # The TLB defiining the interfaces we implement
--- 34,37 ----
***************
*** 42,65 ****
          # Error when not running as a script - eeek - just let it go.
          raise
!     try:
!         pythoncom.MakeIID("MAPI.Session")
!         have_cdo = True
!     except pythoncom.com_error:
!         have_cdo = False
!     print "This Addin requires that Outlook 2000 with CDO be installed on this machine."
      print
!     if have_cdo:
!         print "However, these appear to be installed.  Error details:"
!         print "COM Error 0x%x (%s)" % (hr, msg)
!         if exc:
!             print "Exception: %s" % (exc)
!         print
!         print "Sorry, I can't be more help, but I can't continue while I have this error."
!     else:
!         print "CDO is not currently installed.  To install CDO, you must locate the"
!         print "media from which you installed Outlook (such as Office 2000 CD or "
!         print "sharepoint), re-run setup, select Outlook, enable CDO."
!         print
!         print "Please install CDO then attempt this registration again."
      sys.exit(1)
  
--- 41,51 ----
          # Error when not running as a script - eeek - just let it go.
          raise
!     print "This Addin requires that Outlook 2000 be installed on this machine."
      print
!     print "This appears to not be installed due to the following error:"
!     print "COM Error 0x%x (%s)" % (hr, msg)
!     if exc:
!         print "Exception: %s" % (exc)
!     print "Sorry, I can't be more help, but I can't continue while I have this error."
      sys.exit(1)
  

Index: manager.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/manager.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** manager.py	25 Oct 2002 01:31:42 -0000	1.19
--- manager.py	25 Oct 2002 06:58:20 -0000	1.20
***************
*** 62,70 ****
          self.config = self.LoadConfig()
  
-         cwd = os.getcwd()
-         self.mapi = win32com.client.Dispatch("MAPI.Session")
-         self.mapi.Logon(None, None, False, False)
          self.outlook = outlook
-         os.chdir(cwd)
  
          import_core_spambayes_stuff(self.ini_filename)
--- 62,66 ----
***************
*** 165,171 ****
  
      def Close(self):
-         if self.mapi is not None:
-             self.mapi.Logoff()
-             self.mapi = None
          if self.bayes_dirty and self.bayes:
              print "Warning: BayesManager closed while Bayes database dirty"
--- 161,164 ----