summaryrefslogtreecommitdiffstats
path: root/mailnews/mime
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-11 02:08:59 -0500
commit7406d488b363588be8f677f698be11ea478f377b (patch)
tree4eace33f71b9b53b7500bcadc59c9979ec6f45b1 /mailnews/mime
parent73e14fb7049306439a5637ff261f1370a94518e5 (diff)
downloadUXP-7406d488b363588be8f677f698be11ea478f377b.tar
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.gz
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.lz
UXP-7406d488b363588be8f677f698be11ea478f377b.tar.xz
UXP-7406d488b363588be8f677f698be11ea478f377b.zip
Bug 1584473 - Fix several issues
* Fix undefined HRESULT codes in class CMapiApi in MapiApi.cpp. * Fix doubled up sub-expressions in MIME and MAPI. * Remove broken/unused morkRowCellCursor::MakeCell() Tag #1273
Diffstat (limited to 'mailnews/mime')
-rw-r--r--mailnews/mime/emitters/nsEmitterUtils.cpp1
-rw-r--r--mailnews/mime/src/mimemsig.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/mailnews/mime/emitters/nsEmitterUtils.cpp b/mailnews/mime/emitters/nsEmitterUtils.cpp
index 551bf5b31..2867596ab 100644
--- a/mailnews/mime/emitters/nsEmitterUtils.cpp
+++ b/mailnews/mime/emitters/nsEmitterUtils.cpp
@@ -54,7 +54,6 @@ EmitThisHeaderForPrefSetting(int32_t dispType, const char *header)
(!strcmp(header, HEADER_FOLLOWUP_TO)) ||
(!strcmp(header, HEADER_CC)) ||
(!strcmp(header, HEADER_ORGANIZATION)) ||
- (!strcmp(header, HEADER_REPLY_TO)) ||
(!strcmp(header, HEADER_BCC))
)
return true;
diff --git a/mailnews/mime/src/mimemsig.cpp b/mailnews/mime/src/mimemsig.cpp
index bb34607cb..5b4f8e556 100644
--- a/mailnews/mime/src/mimemsig.cpp
+++ b/mailnews/mime/src/mimemsig.cpp
@@ -599,7 +599,6 @@ MimeMultipartSigned_emit_child (MimeObject *obj)
obj->options->headers != MimeHeadersCitation &&
obj->options->write_html_p &&
obj->options->output_fn &&
- obj->options->headers != MimeHeadersCitation &&
sig->crypto_closure)
{
// Calling crypto_generate_html may trigger wanted side effects,