Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug257990 --> migrate mark spam as read settings to the options dialog

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@197952 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scott%scott-macgregor.org 2006-05-18 20:50:05 +00:00
parent 0b6cbc463e
commit f20fb9d7e7
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/mail/base/content/msgMail3PaneWindow.js
View File

@ -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);

13
mozilla/mail/components/preferences/privacy.xul
View File

@ -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);"

2
mozilla/mail/locales/en-US/chrome/messenger/preferences/privacy.dtd
View File

@ -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">

2
mozilla/mailnews/mailnews.js
View File

@ -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);