diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2019-11-11 01:56:34 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2019-11-11 01:56:34 -0500 |
| commit | 73e14fb7049306439a5637ff261f1370a94518e5 (patch) | |
| tree | f9ef6c4782b0849bae1927f2c1ab9bbd8d97aa4d /mailnews/mime/src/mimecryp.cpp | |
| parent | dc77b707f20280cd057368ca11fafc2c0bfc9414 (diff) | |
| download | UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.gz UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.lz UXP-73e14fb7049306439a5637ff261f1370a94518e5.tar.xz UXP-73e14fb7049306439a5637ff261f1370a94518e5.zip | |
Bug 1240290
Tag #1273
Diffstat (limited to 'mailnews/mime/src/mimecryp.cpp')
| -rw-r--r-- | mailnews/mime/src/mimecryp.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mailnews/mime/src/mimecryp.cpp b/mailnews/mime/src/mimecryp.cpp index 9f6e3630f..fd4f8f8ae 100644 --- a/mailnews/mime/src/mimecryp.cpp +++ b/mailnews/mime/src/mimecryp.cpp @@ -418,18 +418,8 @@ MimeEncrypted_emit_buffered_child(MimeObject *obj) obj->options->headers != MimeHeadersCitation && obj->options->write_html_p && obj->options->output_fn) - // && !mime_crypto_object_p(enc->hdrs, true, obj->options)) // XXX fix later XXX // { char *html; -#if 0 // XXX Fix this later XXX // - char *html = (((MimeEncryptedClass *) obj->clazz)->crypto_generate_html - (enc->crypto_closure)); - if (!html) return -1; /* MK_OUT_OF_MEMORY? */ - - status = MimeObject_write(obj, html, strlen(html), false); - PR_FREEIF(html); - if (status < 0) return status; -#endif /* Now that we have written out the crypto stamp, the outermost header block is well and truly closed. If this is in fact the outermost @@ -445,7 +435,8 @@ MimeEncrypted_emit_buffered_child(MimeObject *obj) for (p = obj; p->parent; p = p->parent) outer_headers = p->headers; NS_ASSERTION(obj->options->state->first_data_written_p, "1.2 <mscott@netscape.com> 01 Nov 2001 17:59"); - html = obj->options->generate_post_header_html_fn(NULL, + char *html = obj->options->generate_post_header_html_fn( + NULL, obj->options->html_closure, outer_headers); obj->options->state->post_header_html_run_p = true; |