Bug 999269 - Forwarding a message without CC header inline gets an empty "CC:" line in header table. r=jcranmer,a=Standard8
authorrsx11m <rsx11m.pub@gmail.com>
Tue, 22 Apr 2014 12:05:39 -0500
changeset 19692 24bc3bbd5c5b93a8ca31bf6adb679b1a7d3b59bf
parent 19691 94312996958eeb31b02ef47043062151eee72d28
child 19693 fd88841bab2f51b11bba46864d1d64aad14f9f42
push id1133
push usermbanner@mozilla.com
push dateMon, 28 Apr 2014 19:42:02 +0000
treeherdercomm-beta@ca498fc736fc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, Standard8
bugs999269
Bug 999269 - Forwarding a message without CC header inline gets an empty "CC:" line in header table. r=jcranmer,a=Standard8
mailnews/mime/src/mimedrft.cpp
--- a/mailnews/mime/src/mimedrft.cpp
+++ b/mailnews/mime/src/mimedrft.cpp
@@ -882,17 +882,17 @@ mime_insert_normal_headers(char         
                       MimeGetNamedString(MIME_MHTML_ORGANIZATION),
                       mailcharset, htmlEdit);
   if (!to.IsEmpty())
   {
     mime_intl_insert_message_header_1(&newBody, to.get(), HEADER_TO,
                       MimeGetNamedString(MIME_MHTML_TO),
                       mailcharset, htmlEdit);
   }
-  if (cc.IsEmpty())
+  if (!cc.IsEmpty())
   {
     mime_intl_insert_message_header_1(&newBody, cc.get(), HEADER_CC,
                       MimeGetNamedString(MIME_MHTML_CC),
                       mailcharset, htmlEdit);
   }
     /*
       Do not reveal bcc recipients when forwarding a message!
       See http://bugzilla.mozilla.org/show_bug.cgi?id=41150
@@ -1003,30 +1003,30 @@ mime_insert_micro_headers(char          
                     MimeGetNamedString(MIME_MHTML_SUBJECT),
                       mailcharset, htmlEdit);
 /*
   if (date)
     mime_intl_insert_message_header_1(&newBody, date, HEADER_DATE,
                     MimeGetNamedString(MIME_MHTML_DATE),
                     mailcharset, htmlEdit);
 */
-  if (resent_from.IsEmpty())
+  if (!resent_from.IsEmpty())
   {
     mime_intl_insert_message_header_1(&newBody, resent_from.get(),
                     HEADER_RESENT_FROM,
                     MimeGetNamedString(MIME_MHTML_RESENT_FROM),
                     mailcharset, htmlEdit);
   }
-  if (to.IsEmpty())
+  if (!to.IsEmpty())
   {
     mime_intl_insert_message_header_1(&newBody, to.get(), HEADER_TO,
                     MimeGetNamedString(MIME_MHTML_TO),
                     mailcharset, htmlEdit);
   }
-  if (cc.IsEmpty())
+  if (!cc.IsEmpty())
   {
     mime_intl_insert_message_header_1(&newBody, cc.get(), HEADER_CC,
                     MimeGetNamedString(MIME_MHTML_CC),
                     mailcharset, htmlEdit);
   }
   /*
     Do not reveal bcc recipients when forwarding a message!
     See http://bugzilla.mozilla.org/show_bug.cgi?id=41150