[Spambayes-checkins] spambayes/Outlook2000 config.py, 1.10, 1.11 filter.py, 1.24, 1.25

[Mark Hammond]

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

Modified Files:
	config.py filter.py 
Log Message:
Allow either spam or unsure messages to be marked as read as they
are filtered.


Index: config.py
===================================================================
RCS file: /cvsroot/spambayes/spambayes/Outlook2000/config.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** config.py	17 Jun 2003 02:04:11 -0000	1.10
--- config.py	18 Jun 2003 01:59:02 -0000	1.11
***************
*** 158,161 ****
--- 158,168 ----
          """""",
          FILTER_ACTION, RESTORE),
+     ("spam_mark_as_read", "Should filtered spam also be marked as 'read'", True,
+         """Determines if spam messages are marked as 'Read' as they are
+         filtered.  This can be set to 'True' if the new-mail icon bothers
+         you when the only new items are spam.  It can be set to 'False'
+         if you use the 'read' state of these messages to determine which
+         items you are yet to review.""",
+         BOOLEAN, RESTORE),
      (FolderIDOption,
          "unsure_folder_id", "The folder used to track uncertain messages", None,
***************
*** 168,171 ****
--- 175,182 ----
          """""",
          FILTER_ACTION, RESTORE),
+     ("unsure_mark_as_read", "Should filtered uncertain message also be marked as 'read'", False,
+         """Determines if unsure 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.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** filter.py	17 Jun 2003 02:04:11 -0000	1.24
--- filter.py	18 Jun 2003 01:59:02 -0000	1.25
***************
*** 54,57 ****
--- 54,60 ----
              folder_id = getattr(config, attr_prefix + "_folder_id")
              action = getattr(config, attr_prefix + "_action").lower()
+             mark_as_read = getattr(config, attr_prefix + "_mark_as_read")
+             if mark_as_read:
+                 msg.SetReadState(True)
              if action.startswith("un"): # untouched
                  pass