#include <modest-runtime.h>
#include "modest-formatter.h"
#include <tny-camel-stream.h>
+#include <tny-camel-mime-part.h>
+#include <camel/camel-stream-buffer.h>
#include <camel/camel-stream-mem.h>
+#include <glib/gprintf.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#include "modest-text-utils.h"
static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
- const gchar *content_type, gboolean has_attachments);
+ const gchar *content_type);
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);
+
TnyMsg*
modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
const gchar *bcc, const gchar* subject, const gchar *body,
- GSList *attachments)
+ GList *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);
+ new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL));
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
/* 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));
+ add_body_part (new_msg, body, content_type);
g_free (content_type);
/* Add attachments */
if (attachments)
- add_attachments (new_msg, (GList*) attachments);
+ add_attachments (new_msg, attachments);
return new_msg;
}
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)
+ GList *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);
+ new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL));
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
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_body_part (new_msg, plain_body, content_type);
add_html_body_part (new_msg, html_body);
g_free (content_type);
/* Add attachments */
- add_attachments (new_msg, (GList*) attachments);
+ add_attachments (new_msg, attachments);
return new_msg;
}
static TnyMimePart *
add_body_part (TnyMsg *msg,
const gchar *body,
- const gchar *content_type,
- gboolean has_attachments)
+ const gchar *content_type)
{
TnyMimePart *text_body_part = NULL;
TnyStream *text_body_stream;
(camel_stream_mem_new_with_buffer
(body, (body ? strlen(body) : 0))));
- /* Create body part if needed */
- if (has_attachments)
- text_body_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
- else
- text_body_part = TNY_MIME_PART(msg);
+ text_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (text_body_stream);
content_type);
tny_stream_reset (text_body_stream);
- /* Add part if needed */
- if (has_attachments) {
- tny_mime_part_add_part (TNY_MIME_PART (msg), text_body_part);
- g_object_unref (G_OBJECT(text_body_part));
- }
+ g_object_unref (G_OBJECT(text_body_part));
/* Clean */
g_object_unref (text_body_stream);
(body, strlen(body))));
/* Create body part if needed */
- html_body_part = tny_platform_factory_new_mime_part
- (modest_runtime_get_platform_factory ());
+ html_body_part = modest_formatter_create_body_part (NULL, msg);
/* Construct MIME part */
tny_stream_reset (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 */
return html_body_part;
}
-static void
-add_attachments (TnyMsg *msg, GList *attachments_list)
+static TnyMimePart *
+copy_mime_part (TnyMimePart *part)
{
- GList *pos;
- TnyMimePart *attachment_part, *old_attachment;
+ TnyMimePart *result = NULL;
const gchar *attachment_content_type;
const gchar *attachment_filename;
const gchar *attachment_cid;
+ TnyList *parts;
+ TnyIterator *iterator;
TnyStream *attachment_stream;
+ if (TNY_IS_MSG (part)) {
+ result = TNY_MIME_PART (tny_platform_factory_new_msg (modest_runtime_get_platform_factory ()));
+ attachment_content_type = "message/rfc822";
+ tny_mime_part_set_content_type (result, attachment_content_type);
+ } else {
+ result = tny_platform_factory_new_mime_part (
+ modest_runtime_get_platform_factory());
+ attachment_content_type = tny_mime_part_get_content_type (part);
+ }
+
+ /* get mime part headers */
+ attachment_filename = tny_mime_part_get_filename (part);
+ attachment_cid = tny_mime_part_get_content_id (part);
+
+ /* fill the stream */
+ attachment_stream = tny_mime_part_get_stream (part);
+ tny_stream_reset (attachment_stream);
+ tny_mime_part_construct_from_stream (result,
+ attachment_stream,
+ attachment_content_type);
+ tny_stream_reset (attachment_stream);
+
+ /* set other mime part fields */
+ tny_mime_part_set_filename (result, attachment_filename);
+ tny_mime_part_set_content_id (result, attachment_cid);
+
+ /* copy subparts */
+ parts = tny_simple_list_new ();
+ tny_mime_part_get_parts (part, parts);
+ iterator = tny_list_create_iterator (parts);
+ while (!tny_iterator_is_done (iterator)) {
+ TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator));
+ TnyMimePart *subpart_copy = copy_mime_part (subpart);
+ tny_mime_part_add_part (result, subpart_copy);
+ g_object_unref (subpart);
+ tny_iterator_next (iterator);
+ }
+ g_object_unref (iterator);
+ g_object_unref (parts);
+ g_object_unref (attachment_stream);
+
+ return result;
+}
+
+static void
+add_attachments (TnyMsg *msg, GList *attachments_list)
+{
+ GList *pos;
+ TnyMimePart *attachment_part, *old_attachment;
+
for (pos = (GList *)attachments_list; pos; pos = pos->next) {
old_attachment = pos->data;
- attachment_filename = tny_mime_part_get_filename (old_attachment);
- attachment_stream = tny_mime_part_get_stream (old_attachment);
- attachment_part = tny_platform_factory_new_mime_part (
- 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,
- attachment_content_type);
- tny_stream_reset (attachment_stream);
-
- tny_mime_part_set_filename (attachment_part, attachment_filename);
- tny_mime_part_set_content_id (attachment_part, attachment_cid);
-
+ attachment_part = copy_mime_part (old_attachment);
tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
-/* g_object_unref (attachment_part); */
}
}
iter = tny_list_create_iterator(parts);
/* no parts? assume it's single-part message */
- if (tny_iterator_is_done(iter))
+ if (tny_iterator_is_done(iter)) {
+ g_object_unref (G_OBJECT(iter));
return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
- else {
+ } else {
gchar *content_type = NULL;
do {
part = TNY_MIME_PART(tny_iterator_get_current (iter));
static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature, gboolean is_reply, guint type)
+create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature,
+ gboolean is_reply, guint type, GList *attachments)
{
TnyMsg *new_msg;
TnyHeader *new_header, *header;
new_msg = modest_formatter_cite (formatter, body, header);
break;
case MODEST_TNY_MSG_REPLY_TYPE_QUOTE:
- new_msg = modest_formatter_quote (formatter, body, header);
+ new_msg = modest_formatter_quote (formatter, body, header, attachments);
break;
}
} else {
switch (type) {
case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
default:
- new_msg = modest_formatter_inline (formatter, body, header);
+ new_msg = modest_formatter_inline (formatter, body, header, attachments);
break;
case MODEST_TNY_MSG_FORWARD_TYPE_ATTACHMENT:
new_msg = modest_formatter_attach (formatter, body, header);
add_if_attachment (gpointer data, gpointer user_data)
{
TnyMimePart *part;
- GList *attachments_list;
+ GList **attachments_list;
part = TNY_MIME_PART (data);
- attachments_list = (GList *) user_data;
+ attachments_list = ((GList **) user_data);
- if (tny_mime_part_is_attachment (part))
- attachments_list = g_list_prepend (attachments_list, part);
+ if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))
+ *attachments_list = g_list_prepend (*attachments_list, part);
}
TnyMsg*
TnyList *parts = NULL;
GList *attachments_list = NULL;
- new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type);
-
/* Add attachments */
parts = TNY_LIST (tny_simple_list_new());
tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
- tny_list_foreach (parts, add_if_attachment, attachments_list);
+ tny_list_foreach (parts, add_if_attachment, &attachments_list);
+
+ new_msg = create_reply_forward_mail (msg, from, signature, FALSE, forward_type, attachments_list);
add_attachments (new_msg, attachments_list);
/* Clean */
gchar *new_cc = NULL;
const gchar *cc = NULL, *bcc = NULL;
GString *tmp = NULL;
+ TnyList *parts = NULL;
+ GList *attachments_list = NULL;
+
+ /* Add attachments */
+ parts = TNY_LIST (tny_simple_list_new());
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+ tny_list_foreach (parts, add_if_attachment, &attachments_list);
- new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type);
+ new_msg = create_reply_forward_mail (msg, from, signature, TRUE, reply_type, attachments_list);
+ if (attachments_list) {
+ g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
+ g_list_free (attachments_list);
+ }
+ g_object_unref (G_OBJECT (parts));
/* Fill the header */
header = tny_msg_get_header (msg);
projects / modest / blobdiff