static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
const gchar *content_type, gboolean has_attachments);
+static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
static void add_attachments (TnyMsg *msg, GList *attachments_list);
static char * get_content_type(const gchar *s);
static gboolean is_ascii(const gchar *s);
tny_header_set_to (TNY_HEADER (header), mailto);
tny_header_set_cc (TNY_HEADER (header), cc);
tny_header_set_bcc (TNY_HEADER (header), bcc);
- tny_header_set_subject (TNY_HEADER (header), subject);
+
+ if (subject)
+ tny_header_set_subject (TNY_HEADER (header), subject);
content_type = get_content_type(body);
- /* Add the body of the new mail */
+ /* Add the body of the new mail */
+ /* This is needed even if body is NULL or empty. */
add_body_part (new_msg, body, content_type, (attachments ? TRUE: FALSE));
+ g_free (content_type);
+
+ /* Add attachments */
+ if (attachments)
+ add_attachments (new_msg, (GList*) attachments);
+
+ return new_msg;
+}
+
+TnyMsg*
+modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gchar *cc,
+ const gchar *bcc, const gchar* subject,
+ const gchar *html_body, const gchar *plain_body,
+ GSList *attachments)
+{
+ TnyPlatformFactory *fact;
+ TnyMsg *new_msg;
+ TnyHeader *header;
+ gchar *content_type;
+
+ /* Create new msg */
+ fact = modest_runtime_get_platform_factory ();
+ new_msg = tny_platform_factory_new_msg (fact);
+ header = tny_msg_get_header (new_msg);
+
+ tny_header_set_from (TNY_HEADER (header), from);
+ tny_header_set_replyto (TNY_HEADER (header), from);
+ tny_header_set_to (TNY_HEADER (header), mailto);
+ tny_header_set_cc (TNY_HEADER (header), cc);
+ tny_header_set_bcc (TNY_HEADER (header), bcc);
+ tny_header_set_subject (TNY_HEADER (header), subject);
+
+ content_type = get_content_type(plain_body);
+
+ /* Add the body of the new mail */
+ add_body_part (new_msg, plain_body, content_type, TRUE);
+ add_html_body_part (new_msg, html_body);
+ g_free (content_type);
/* Add attachments */
add_attachments (new_msg, (GList*) attachments);
/* Create the stream */
text_body_stream = TNY_STREAM (tny_camel_stream_new
(camel_stream_mem_new_with_buffer
- (body, strlen(body))));
+ (body, (body ? strlen(body) : 0))));
/* Create body part if needed */
if (has_attachments)
return text_body_part;
}
+static TnyMimePart *
+add_html_body_part (TnyMsg *msg,
+ const gchar *body)
+{
+ TnyMimePart *html_body_part = NULL;
+ TnyStream *html_body_stream;
+
+ /* Create the stream */
+ html_body_stream = TNY_STREAM (tny_camel_stream_new
+ (camel_stream_mem_new_with_buffer
+ (body, strlen(body))));
+
+ /* Create body part if needed */
+ html_body_part = tny_platform_factory_new_mime_part
+ (modest_runtime_get_platform_factory ());
+
+ /* Construct MIME part */
+ tny_stream_reset (html_body_stream);
+ tny_mime_part_construct_from_stream (html_body_part,
+ html_body_stream,
+ "text/html; charset=utf-8");
+ tny_stream_reset (html_body_stream);
+
+ /* Add part if needed */
+ tny_mime_part_add_part (TNY_MIME_PART (msg), html_body_part);
+ g_object_unref (G_OBJECT(html_body_part));
+
+ /* Clean */
+ g_object_unref (html_body_stream);
+
+ return html_body_part;
+}
+
static void
add_attachments (TnyMsg *msg, GList *attachments_list)
{
TnyMimePart *attachment_part, *old_attachment;
const gchar *attachment_content_type;
const gchar *attachment_filename;
+ const gchar *attachment_cid;
TnyStream *attachment_stream;
for (pos = (GList *)attachments_list; pos; pos = pos->next) {
modest_runtime_get_platform_factory());
attachment_content_type = tny_mime_part_get_content_type (old_attachment);
+ attachment_cid = tny_mime_part_get_content_id (old_attachment);
tny_mime_part_construct_from_stream (attachment_part,
attachment_stream,
tny_stream_reset (attachment_stream);
tny_mime_part_set_filename (attachment_part, attachment_filename);
+ tny_mime_part_set_content_id (attachment_part, attachment_cid);
tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
/* g_object_unref (attachment_part); */
tny_stream_reset (stream);
tny_mime_part_decode_to_stream (body, stream);
tny_stream_reset (stream);
-
- g_object_unref (G_OBJECT(stream));
- g_object_unref (G_OBJECT(body));
gtk_text_buffer_get_bounds (buf, &start, &end);
to_quote = gtk_text_buffer_get_text (buf, &start, &end, FALSE);
+ if (tny_mime_part_content_type_is (body, "text/plain")) {
+ gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote);
+ g_free (to_quote);
+ to_quote = to_quote_converted;
+ }
+
g_object_unref (buf);
+ g_object_unref (G_OBJECT(stream));
+ g_object_unref (G_OBJECT(body));
return to_quote;
}
static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, guint type)
+create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, gboolean is_reply, guint type)
{
TnyMsg *new_msg;
TnyHeader *new_header, *header;
gchar *new_subject;
TnyMimePart *body;
ModestFormatter *formatter;
+ gchar *subject_prefix;
/* Get body from original msg. Always look for the text/plain
part of the message to create the reply/forwarded mail */
body = modest_tny_msg_find_body_part (msg, FALSE);
/* TODO: select the formatter from account prefs */
- formatter = modest_formatter_new ("text/plain");
+ if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
+ formatter = modest_formatter_new ("text/html", signature);
+ else
+ formatter = modest_formatter_new ("text/plain", signature);
/* Format message body */
if (is_reply) {
tny_header_set_replyto (new_header, from);
/* Change the subject */
+ if (is_reply)
+ subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL);
+ else
+ subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL);
new_subject =
(gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
- (is_reply) ? _("Re:") : _("Fwd:"));
+ subject_prefix);
+ g_free (subject_prefix);
tny_header_set_subject (new_header, (const gchar *) new_subject);
g_free (new_subject);
TnyMsg*
modest_tny_msg_create_forward_msg (TnyMsg *msg,
const gchar *from,
+ const gchar *signature,
ModestTnyMsgForwardType forward_type)
{
TnyMsg *new_msg;
TnyList *parts = NULL;
GList *attachments_list = NULL;
- new_msg = create_reply_forward_mail (msg, from, FALSE, forward_type);
+ new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type);
/* Add attachments */
parts = TNY_LIST (tny_simple_list_new());
TnyMsg*
modest_tny_msg_create_reply_msg (TnyMsg *msg,
const gchar *from,
+ const gchar *signature,
ModestTnyMsgReplyType reply_type,
ModestTnyMsgReplyMode reply_mode)
{
const gchar *cc = NULL, *bcc = NULL;
GString *tmp = NULL;
- new_msg = create_reply_forward_mail (msg, from, TRUE, reply_type);
+ new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type);
/* Fill the header */
header = tny_msg_get_header (msg);
projects / modest / blobdiff