Bug 1802815 - hdr Charset -> charset. r=benc
Differential Revision: https://phabricator.services.mozilla.com/D163293 --HG-- extra : rebase_source : c2e6edc506ccaf1236f834e58b61e3daf4ac5bc1 extra : amend_source : 5fea2005dc5bbd2ba844f93288cfa412e451a441
This commit is contained in:
Родитель
f218f23c6a
Коммит
9a57b5d399
|
@ -55,7 +55,7 @@ var calendarTaskButtonDNDObserver;
|
|||
onDataAvailable(request, inputStream, offset, count) {
|
||||
plainTextMessage = msgFolder.getMsgTextFromStream(
|
||||
inputStream,
|
||||
aMsgHdr.Charset,
|
||||
aMsgHdr.charset,
|
||||
65536,
|
||||
32768,
|
||||
false,
|
||||
|
|
|
@ -95,7 +95,7 @@ var calendarExtract = {
|
|||
onDataAvailable(request, inputStream, offset, count) {
|
||||
content = folder.getMsgTextFromStream(
|
||||
inputStream,
|
||||
message.Charset,
|
||||
message.charset,
|
||||
65536,
|
||||
32768,
|
||||
false,
|
||||
|
|
|
@ -183,7 +183,7 @@ SearchIntegration = {
|
|||
let folder = this._msgHdr.folder;
|
||||
let text = folder.getMsgTextFromStream(
|
||||
stringStream,
|
||||
this._msgHdr.Charset,
|
||||
this._msgHdr.charset,
|
||||
20000,
|
||||
20000,
|
||||
false,
|
||||
|
|
|
@ -260,7 +260,7 @@ SearchIntegration = {
|
|||
let folder = this._msgHdr.folder;
|
||||
let text = folder.getMsgTextFromStream(
|
||||
stringStream,
|
||||
this._msgHdr.Charset,
|
||||
this._msgHdr.charset,
|
||||
65536,
|
||||
50000,
|
||||
false,
|
||||
|
|
|
@ -91,14 +91,15 @@ interface nsIMsgDBHdr : nsISupports
|
|||
Array<octet> getSubjectCollationKey();
|
||||
Array<octet> getRecipientsCollationKey();
|
||||
|
||||
attribute string Charset;
|
||||
attribute string charset;
|
||||
|
||||
/**
|
||||
* Returns the effective character set for the message (@ref Charset).
|
||||
* If there is no specific set defined for the message or the
|
||||
* characterSetOverride option is turned on for the folder it will return
|
||||
* the effective character set of the folder instead.
|
||||
* Returns the effective character set for the message (@ref charset).
|
||||
* For NNTP, if there is no specific set defined for the message,
|
||||
* the character set of the server instead.
|
||||
*/
|
||||
readonly attribute ACString effectiveCharset;
|
||||
|
||||
attribute nsMsgLabelValue label;
|
||||
attribute string accountKey;
|
||||
readonly attribute nsIMsgFolder folder;
|
||||
|
|
|
@ -214,7 +214,7 @@ async function testReply(aHrdIdx, aTemplateHdrIdx = 0) {
|
|||
// XXX: something's wrong with how the fake server gets the data.
|
||||
// The text gets converted to UTF-8 (regardless of what it is) at some point.
|
||||
// Suspect a bug with how BinaryInputStream handles the strings.
|
||||
if (templateHdr.Charset == "windows-1252") {
|
||||
if (templateHdr.charset == "windows-1252") {
|
||||
// XXX: should really check for "åäö xlatin1"
|
||||
if (!body.includes("åäö xlatin1")) {
|
||||
// template-latin1 contains this
|
||||
|
@ -225,7 +225,7 @@ async function testReply(aHrdIdx, aTemplateHdrIdx = 0) {
|
|||
body
|
||||
);
|
||||
}
|
||||
} else if (templateHdr.Charset == "utf-8") {
|
||||
} else if (templateHdr.charset == "utf-8") {
|
||||
// XXX: should really check for "åäö xutf8"
|
||||
if (!body.includes("åäö xutf8")) {
|
||||
// template-utf8 contains this
|
||||
|
@ -236,10 +236,10 @@ async function testReply(aHrdIdx, aTemplateHdrIdx = 0) {
|
|||
body
|
||||
);
|
||||
}
|
||||
} else if (templateHdr.Charset) {
|
||||
} else if (templateHdr.charset) {
|
||||
do_throw(
|
||||
"unexpected msg charset: " +
|
||||
templateHdr.Charset +
|
||||
templateHdr.charset +
|
||||
", hdr msgid=" +
|
||||
templateHdr.messageId
|
||||
);
|
||||
|
|
Загрузка…
Ссылка в новой задаче