From 876a84992ad13848a9f77d2f0cd4a8c8d3c0b75a Mon Sep 17 00:00:00 2001 From: Ryan Johnson Date: Mon, 24 Jun 2013 09:33:18 -0700 Subject: Fix for MCMessageBuilder copy constructor Fix for HTML body being overwritten with text body. --- src/core/rfc822/MCMessageBuilder.cc | 2 +- tests/test-all.mm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc index 435557db..ea449fd6 100644 --- a/src/core/rfc822/MCMessageBuilder.cc +++ b/src/core/rfc822/MCMessageBuilder.cc @@ -478,7 +478,7 @@ MessageBuilder::MessageBuilder(MessageBuilder * other) { init(); setHTMLBody(other->mHTMLBody); - setHTMLBody(other->mTextBody); + setTextBody(other->mTextBody); setAttachments(other->mAttachments); setRelatedAttachments(other->mRelatedAttachments); MC_SAFE_REPLACE_COPY(String, mBoundaryPrefix, other->mBoundaryPrefix); diff --git a/tests/test-all.mm b/tests/test-all.mm index cfa37b66..2201d6d5 100644 --- a/tests/test-all.mm +++ b/tests/test-all.mm @@ -67,7 +67,13 @@ static mailcore::Data * testMessageBuilder() MCLog("%s", data->bytes()); + mailcore::MessageBuilder * msg2 = new mailcore::MessageBuilder(msg); + mailcore::String *htmlBody = msg->htmlBody(); + mailcore::String *htmlBody2 = msg2->htmlBody(); + MCAssert(htmlBody->isEqual(htmlBody2)); + msg->release(); + msg2->release(); return data; } -- cgit v1.2.3