From 7f131ce5cfb176b583296cc1dc252d9bb3975efe Mon Sep 17 00:00:00 2001 From: Andrea Zagli Date: Mon, 14 Nov 2011 16:20:49 +0100 Subject: [PATCH] In SolipaMail implemented multipart/alternative messages. --- src/mail.c | 34 ++++++++++++++++++++++++++++++---- tests/mail.c | 10 +++++++++- 2 files changed, 39 insertions(+), 5 deletions(-) diff --git a/src/mail.c b/src/mail.c index 7ae1acf..095cbb3 100644 --- a/src/mail.c +++ b/src/mail.c @@ -287,13 +287,39 @@ static CamelMimeMessage } /* TODO multipart message */ - if (priv->body_plain != NULL) + if (priv->body_plain != NULL + && priv->body_html != NULL) { - camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_plain, strlen (priv->body_plain), "text/plain"); + CamelMultipart *mp; + CamelMimePart *part; + + mp = camel_multipart_new (); + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternative"); + camel_multipart_set_boundary (mp, NULL); + camel_multipart_set_preface (mp, "This is a multipart message in MIME format."); + + part = camel_mime_part_new (); + camel_mime_part_set_content (part, priv->body_plain, strlen (priv->body_plain), "text/plain"); + camel_multipart_add_part (mp, part); + g_object_unref (part); + + part = camel_mime_part_new (); + camel_mime_part_set_content (part, priv->body_html, strlen (priv->body_html), "text/html"); + camel_multipart_add_part (mp, part); + g_object_unref (part); + + camel_medium_set_content (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp)); } - if (priv->body_html != NULL) + else { - camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_html, strlen (priv->body_html), "text/html"); + if (priv->body_plain != NULL) + { + camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_plain, strlen (priv->body_plain), "text/plain"); + } + if (priv->body_html != NULL) + { + camel_mime_part_set_content (CAMEL_MIME_PART (msg), priv->body_html, strlen (priv->body_html), "text/html"); + } } if (priv->attachments != NULL) diff --git a/tests/mail.c b/tests/mail.c index 0d78930..045ea37 100644 --- a/tests/mail.c +++ b/tests/mail.c @@ -44,7 +44,15 @@ main (int argc, char **argv) solipa_mail_add_recipient (smail, addr, SOLIPA_MAIL_RECIPIENT_TYPE_TO); g_object_unref (addr); - solipa_mail_set_body (smail, "This is the text\nof the email\n that i'm trying to send to myself.\n\nBye bye\n\nSee you later.", NULL); + solipa_mail_set_body (smail, "This is the text\nof the email\n that i'm trying to send to myself.\n\nBye bye\n\nSee you later.", + "\n" + "\n" + "The title</title\n" + "</head>\n" + "<body>\n" + "This is the text in HTML<br />of the email<br />that i'm trying to send to myself.<br /><br />Bye bye<br /><br />See you later." + "</body>\n" + "</html>"); strmail = solipa_mail_get_as_string (smail); g_message ("The email text:\n%s", strmail); -- 2.49.0