[Spambayes-checkins] spambayes/Outlook2000 config.py, 1.34, 1.35 filter.py, 1.40, 1.41

[Tony Meyer]

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

Modified Files:
	config.py filter.py 
Log Message:
Add [ 1036970 ] Allow Outlook plugin to move ham to a designated folder

This can't be configured via the GUI at the moment, but does at least provide the
 capability.  If we end up making more room in the Manager dialog before 1.1 goes
 out, then adding configuration for this would be reasonable to do, as long as it
 doesn't end up looking too complicated.

Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** config.py	3 Dec 2004 21:43:19 -0000	1.34
--- config.py	8 Dec 2004 04:27:59 -0000	1.35
***************
*** 188,192 ****
          will be considered spam, and processed accordingly."""),
          REAL, RESTORE),
!     ("spam_action", _("The action to take for new spam"), "Moved",
          _("""The action that should be taken as Spam messages arrive."""),
          FILTER_ACTION, RESTORE),
--- 188,192 ----
          will be considered spam, and processed accordingly."""),
          REAL, RESTORE),
!     ("spam_action", _("The action to take for new spam"), FILTER_ACTION[1],
          _("""The action that should be taken as Spam messages arrive."""),
          FILTER_ACTION, RESTORE),
***************
*** 215,218 ****
--- 215,229 ----
          filtered.  See 'spam_mark_as_read' for more details."""),
          BOOLEAN, RESTORE),
+     (FolderIDOption,
+      "ham_folder_id", _("The folder to which good messages are moved"), None,
+         _("""The folder SpamBayes moves or copies good messages to."""),
+         FOLDER_ID, DO_NOT_RESTORE),
+     ("ham_action", _("The action to take for new good messages"), FILTER_ACTION[0],
+         _("""The action that should be taken as good messages arrive."""),
+         FILTER_ACTION, RESTORE),
+     ("ham_mark_as_read", _("Should filtered good message also be marked as 'read'"), False,
+         _("""Determines if good messages are marked as 'Read' as they are
+         filtered.  See 'spam_mark_as_read' for more details."""),
+         BOOLEAN, RESTORE),
      ("enabled", _("Is filtering enabled?"), False,
          _(""""""),

Index: filter.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/filter.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** filter.py	26 Nov 2004 03:11:43 -0000	1.40
--- filter.py	8 Dec 2004 04:27:59 -0000	1.41
***************
*** 22,26 ****
      else:
          disposition = "No"
!         attr_prefix = None
  
      ms = mgr.message_store
--- 22,26 ----
      else:
          disposition = "No"
!         attr_prefix = "ham"
  
      ms = mgr.message_store