[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.32,1.33

[Mark Hammond]

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

Modified Files:
	addin.py 
Log Message:
Add a dumb exception handler for the folder switch event.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** addin.py	14 Nov 2002 01:16:11 -0000	1.32
--- addin.py	14 Nov 2002 02:52:50 -0000	1.33
***************
*** 277,296 ****
          show_delete_as = True
          show_recover_as = False
!         if outlook_folder is not None:
!             mapi_folder = self.manager.message_store.GetFolder(outlook_folder)
!             look_id = self.manager.config.filter.spam_folder_id
!             if look_id:
!                 look_folder = self.manager.message_store.GetFolder(look_id)
!                 if mapi_folder == look_folder:
!                     # This is the Spam folder - only show "recover"
!                     show_recover_as = True
!                     show_delete_as = False
!             # Check if uncertain
!             look_id = self.manager.config.filter.unsure_folder_id
!             if look_id:
!                 look_folder = self.manager.message_store.GetFolder(look_id)
!                 if mapi_folder == look_folder:
!                     show_recover_as = True
!                     show_delete_as = True
          self.but_recover_as.Visible = show_recover_as
          self.but_delete_as.Visible = show_delete_as
--- 277,301 ----
          show_delete_as = True
          show_recover_as = False
!         try:
!             if outlook_folder is not None:
!                 mapi_folder = self.manager.message_store.GetFolder(outlook_folder)
!                 look_id = self.manager.config.filter.spam_folder_id
!                 if look_id:
!                     look_folder = self.manager.message_store.GetFolder(look_id)
!                     if mapi_folder == look_folder:
!                         # This is the Spam folder - only show "recover"
!                         show_recover_as = True
!                         show_delete_as = False
!                 # Check if uncertain
!                 look_id = self.manager.config.filter.unsure_folder_id
!                 if look_id:
!                     look_folder = self.manager.message_store.GetFolder(look_id)
!                     if mapi_folder == look_folder:
!                         show_recover_as = True
!                         show_delete_as = True
!         except:
!             print "Error finding the MAPI folders for a folder switch event"
!             import traceback
!             traceback.print_exc()
          self.but_recover_as.Visible = show_recover_as
          self.but_delete_as.Visible = show_delete_as