[Spambayes-checkins] spambayes/Outlook2000 addin.py,1.61,1.62

[Mark Hammond]

Update of /cvsroot/spambayes/spambayes/Outlook2000
In directory sc8-pr-cvs1:/tmp/cvs-serv27171

Modified Files:
	addin.py 
Log Message:
DeleteAsSpam didn't detect "no folder" correctly.


Index: addin.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/addin.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** addin.py	17 Jun 2003 02:04:10 -0000	1.61
--- addin.py	17 Jun 2003 04:23:29 -0000	1.62
***************
*** 358,363 ****
          win32ui.DoWaitCursor(1)
          # Delete this item as spam.
          spam_folder_id = self.manager.config.filter.spam_folder_id
!         spam_folder = msgstore.GetFolder(spam_folder_id)
          if not spam_folder:
              self.manager.ReportError("You must configure the Spam folder",
--- 358,365 ----
          win32ui.DoWaitCursor(1)
          # Delete this item as spam.
+         spam_folder = None
          spam_folder_id = self.manager.config.filter.spam_folder_id
!         if spam_folder_id:
!             spam_folder = msgstore.GetFolder(spam_folder_id)
          if not spam_folder:
              self.manager.ReportError("You must configure the Spam folder",