From f20fb9d7e71c1cd330d2d49670414f189928953a Mon Sep 17 00:00:00 2001
From: "scott%scott-macgregor.org"
 <scott%scott-macgregor.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 18 May 2006 20:50:05 +0000
Subject: [PATCH] Bug257990 --> migrate mark spam as read settings to the
 options dialog

git-svn-id: svn://10.0.0.236/trunk@197952 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mail/base/content/msgMail3PaneWindow.js     |  2 ++
 mozilla/mail/components/preferences/privacy.xul     | 13 ++++++++++---
 .../en-US/chrome/messenger/preferences/privacy.dtd  |  2 ++
 mozilla/mailnews/mailnews.js                        |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mozilla/mail/base/content/msgMail3PaneWindow.js b/mozilla/mail/base/content/msgMail3PaneWindow.js
index 5635501a1e4..3cfcea217f1 100644
--- a/mozilla/mail/base/content/msgMail3PaneWindow.js
+++ b/mozilla/mail/base/content/msgMail3PaneWindow.js
@@ -1715,6 +1715,8 @@ function MigrateJunkMailSettings()
         pref.setIntPref("mail.spam.manualMarkMode", pref.getIntPref(prefix + "manualMarkMode"));
       if (pref.prefHasUserValue(prefix + "spamLoggingEnabled"))
         pref.setBoolPref("mail.spam.logging.enabled", pref.getBoolPref(prefix + "spamLoggingEnabled"));
+      if (pref.prefHasUserValue(prefix + "markAsReadOnSpam"))
+        pref.setBoolPref("mail.spam.markAsReadOnSpam", pref.getBoolPref(prefix + "markAsReadOnSpam"));
     }  
     // bump the version so we don't bother doing this again.
     pref.setIntPref("mail.spam.version", 1);
diff --git a/mozilla/mail/components/preferences/privacy.xul b/mozilla/mail/components/preferences/privacy.xul
index 84e15aad1c1..e88df1c2cc3 100644
--- a/mozilla/mail/components/preferences/privacy.xul
+++ b/mozilla/mail/components/preferences/privacy.xul
@@ -72,9 +72,12 @@
       <preference id="mail.spam.manualMark" 
                   name="mail.spam.manualMark" 
                   type="bool"/>
-      <preference id="mail.spam.manualMarkMode" 
-                  name="mail.spam.manualMarkMode" 
-                  type="int"/>      
+      <preference id="mail.spam.manualMarkMode"
+                  name="mail.spam.manualMarkMode"
+                  type="int"/>
+      <preference id="mail.spam.markAsReadOnSpam"
+                  name="mail.spam.markAsReadOnSpam"
+                  type="bool"/>
       <preference id="mail.spam.logging.enabled" 
                   name="mail.spam.logging.enabled" 
                   type="bool"/>
@@ -151,6 +154,10 @@
             <radio id="manualMarkMode1" value="1" label="&manualMarkModeDelete.label;"/>
           </radiogroup>
           
+          <checkbox id="markAsReadOnSpam" label="&markAsReadOnSpam.label;" 
+                    accesskey="&markAsReadOnSpam.acesskey;"
+                    preference="mail.spam.markAsReadOnSpam"/>
+
           <hbox align="start">
             <checkbox id="enableJunkLogging" label="&enableJunkLogging.label;"
                       oncommand="gPrivacyPane.updateJunkLogButton(this.checked);" 
diff --git a/mozilla/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd b/mozilla/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
index 5a70d633788..95d08c51389 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
@@ -16,6 +16,8 @@
 <!ENTITY junkMail.intro "Goto Account Settings to configure account specific junk mail settings.">
 <!ENTITY manualMark.label "When I mark messages as junk:">
 <!ENTITY manualMarkModeMove.label "Move them to the account's &quot;Junk&quot; folder">
+<!ENTITY markAsReadOnSpam.label "Mark messages determined to be Junk as read">
+<!ENTITY markAsReadOnSpam.acesskey "k">
 <!ENTITY manualMarkModeDelete.label "Delete them">
 <!ENTITY enableJunkLogging.label "Enable junk filter logging">
 <!ENTITY enableJunkLogging.accesskey "g">
diff --git a/mozilla/mailnews/mailnews.js b/mozilla/mailnews/mailnews.js
index cfd29ceb1d3..f35c2ff621e 100644
--- a/mozilla/mailnews/mailnews.js
+++ b/mozilla/mailnews/mailnews.js
@@ -460,7 +460,6 @@ pref("mail.server.default.use_idle", true);
 // for spam
 pref("mail.server.default.spamLevel",100);  // 0 off, 100 on.  not doing bool since we might have real levels one day.
 pref("mail.server.default.moveOnSpam",false);
-pref("mail.server.default.markAsReadOnSpam",false);
 pref("mail.server.default.moveTargetMode",0); // 0 == "Junk" on server, 1 == specific folder
 pref("mail.server.default.spamActionTargetAccount","");
 pref("mail.server.default.spamActionTargetFolder","");
@@ -479,6 +478,7 @@ pref("mail.adaptivefilters.junk_threshold", 90);
 pref("mail.spam.version", 0); // used to determine when to migrate global spam settings
 pref("mail.spam.logging.enabled", false);
 pref("mail.spam.manualMark", false);
+pref("mail.spam.markAsReadOnSpam", false);
 pref("mail.spam.manualMarkMode", 0); // 0 == "move to junk folder", 1 == "delete"
 
 pref("mail.autoComplete.highlightNonMatches", true);