Bug 724450 - Replace last Application.prefs uses with Services.prefs in SeaMonkey. r,sr=mnyromyr

This commit is contained in:
rsx11m 2012-03-09 17:45:43 -05:00
Родитель 25c91541c8
Коммит bbafc8f6a9
1 изменённых файлов: 5 добавлений и 7 удалений

Просмотреть файл

@ -609,7 +609,7 @@ function InitNewMsgMenu(aPopup)
// If the identity is not found, use the mail.html_compose pref to
// determine the message compose type (HTML or PlainText).
var composeHTML = identity ? identity.composeHtml
: Application.prefs.getValue("mail.html_compose", true);
: Services.prefs.getBoolPref("mail.html_compose");
const kIDs = {true: "button-newMsgHTML", false: "button-newMsgPlain"};
document.getElementById(kIDs[composeHTML]).setAttribute("default", "true");
document.getElementById(kIDs[!composeHTML]).removeAttribute("default");
@ -617,8 +617,7 @@ function InitNewMsgMenu(aPopup)
function InitMessageForward(aPopup)
{
var forwardType = Application.prefs.getValue("mail.forward_message_mode",
kMsgForwardAsAttachment);
var forwardType = Services.prefs.getIntPref("mail.forward_message_mode");
if (forwardType != kMsgForwardAsAttachment)
{
@ -1203,9 +1202,9 @@ BatchMessageMover.prototype =
// RSS servers don't have an identity so we special case the archives URI.
archiveFolderUri = server.serverURI + "/Archives";
archiveGranularity =
Application.prefs.get("mail.identity.default.archive_granularity").value;
Services.prefs.getIntPref("mail.identity.default.archive_granularity");
archiveKeepFolderStructure =
Application.prefs.get("mail.identity.default.archive_keep_folder_structure").value;
Services.prefs.getBoolPref("mail.identity.default.archive_keep_folder_structure");
}
else {
let identity = GetIdentityForHeader(msgHdr,
@ -1424,8 +1423,7 @@ function MsgArchiveSelectedMessages(aEvent)
function MsgForwardMessage(event)
{
var forwardType = Application.prefs.getValue("mail.forward_message_mode",
kMsgForwardAsAttachment);
var forwardType = Services.prefs.getIntPref("mail.forward_message_mode");
// mail.forward_message_mode could be 1, if the user migrated from 4.x
// 1 (forward as quoted) is obsolete, so we treat is as forward inline