[Spambayes-checkins] spambayes/Outlook2000/dialogs FilterDialog.py,1.13,1.14 TrainingDialog.py,1.9,1.10

[Mark Hammond]

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

Modified Files:
	FilterDialog.py TrainingDialog.py 
Log Message:
Ensure all default folders are "fully qualified".


Index: FilterDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/FilterDialog.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FilterDialog.py	23 Jan 2003 12:17:35 -0000	1.13
--- FilterDialog.py	25 Jan 2003 06:51:01 -0000	1.14
***************
*** 87,91 ****
          if len(self.watch_folder_ids)==0 and mgr.outlook is not None:
              inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.watch_folder_ids = [inbox.EntryID]
  
          self.spam_folder_id = mgr.config.filter.spam_folder_id
--- 87,91 ----
          if len(self.watch_folder_ids)==0 and mgr.outlook is not None:
              inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.watch_folder_ids = [(inbox.StoreID, inbox.EntryID)]
  
          self.spam_folder_id = mgr.config.filter.spam_folder_id
***************
*** 389,393 ****
      mgr.config = config = Config()
      config.filter = Config()
!     config.filter.watch_folder_ids = [outlook.Session.GetDefaultFolder(constants.olFolderInbox).EntryID]
      config.filter.watch_folder_include_sub = True
      config.filter.spam_folder_id = ""
--- 389,394 ----
      mgr.config = config = Config()
      config.filter = Config()
!     inbox = outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!     config.filter.watch_folder_ids = [(inbox.StoreID, inbox.EntryID)]
      config.filter.watch_folder_include_sub = True
      config.filter.spam_folder_id = ""
***************
*** 398,402 ****
      config.filter.unsure_threshold = 20
      config.filter_now=Config()
!     config.filter_now.folder_ids = [outlook.Session.GetDefaultFolder(constants.olFolderInbox).EntryID]
      config.filter_now.include_sub = True
      config.filter_now.only_unread = False
--- 399,404 ----
      config.filter.unsure_threshold = 20
      config.filter_now=Config()
!     inbox = outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!     config.filter_now.folder_ids = [(inbox.StoreID, inbox.EntryID)]
      config.filter_now.include_sub = True
      config.filter_now.only_unread = False

Index: TrainingDialog.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/dialogs/TrainingDialog.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TrainingDialog.py	23 Jan 2003 12:17:35 -0000	1.9
--- TrainingDialog.py	25 Jan 2003 06:51:02 -0000	1.10
***************
*** 71,75 ****
          if len(self.config.ham_folder_ids)==0 and self.mgr.outlook is not None:
              inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.config.ham_folder_ids = [inbox.EntryID]
          # If we have no known spam folders, but do have a spam folder
          # defined in the filters, use it.
--- 71,75 ----
          if len(self.config.ham_folder_ids)==0 and self.mgr.outlook is not None:
              inbox = self.mgr.outlook.Session.GetDefaultFolder(constants.olFolderInbox)
!             self.config.ham_folder_ids = [(inbox.StoreID, inbox.EntryID)]
          # If we have no known spam folders, but do have a spam folder
          # defined in the filters, use it.