#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>
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)
{
TnyMsg *new_msg;
TnyHeader *header;
/* 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)
{
TnyMsg *new_msg;
TnyHeader *header;
g_free (content_type);
/* Add attachments */
- add_attachments (new_msg, (GList*) attachments);
+ add_attachments (new_msg, attachments);
return new_msg;
}
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)) {
+ g_object_ref (part);
+ return part;
+ }
+
+ 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));
+ if (subpart) {
+ 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);
- if (TNY_IS_MSG (old_attachment)) {
- attachment_part = TNY_MIME_PART (tny_platform_factory_new_msg (modest_runtime_get_platform_factory ()));
- } else {
- 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_stream_reset (attachment_stream);
- 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_stream);
-/* g_object_unref (attachment_part); */
+ g_object_unref (attachment_part);
}
}
gchar *
-modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html)
+modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
{
TnyStream *stream;
TnyMimePart *body;
GtkTextBuffer *buf;
GtkTextIter start, end;
gchar *to_quote;
+ gboolean result_was_html = TRUE;
body = modest_tny_msg_find_body_part(msg, want_html);
if (!body)
gchar *to_quote_converted = modest_text_utils_convert_to_html (to_quote);
g_free (to_quote);
to_quote = to_quote_converted;
+ result_was_html = FALSE;
}
g_object_unref (buf);
g_object_unref (G_OBJECT(stream));
g_object_unref (G_OBJECT(body));
+ if (is_html != NULL)
+ *is_html = result_was_html;
+
return to_quote;
}
{
const gchar *mime_type = want_html ? "text/html" : "text/plain";
TnyMimePart *part = NULL;
- TnyList *parts;
- TnyIterator *iter;
+ TnyList *parts = NULL;
+ TnyIterator *iter = NULL;
if (!msg)
return NULL;
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));
+ if (part && TNY_IS_MSG (part)) {
+ g_object_unref (part);
+ tny_iterator_next (iter);
+ continue;
+ }
/* we need to strdown the content type, because
* tny_mime_part_has_content_type does not do it...
*/
- content_type = g_ascii_strdown
- (tny_mime_part_get_content_type (part), -1);
+ if (part) {
+ content_type = g_ascii_strdown
+ (tny_mime_part_get_content_type (part), -1);
+ }
if (g_str_has_prefix (content_type, mime_type) &&
!tny_mime_part_is_attachment (part))
if (part)
break;
}
+
if (part)
g_object_unref (G_OBJECT(part));
static TnyMsg *
-create_reply_forward_mail (TnyMsg *msg, const gchar *from, const gchar *signature,
+create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from, const gchar *signature,
gboolean is_reply, guint type, GList *attachments)
{
TnyMsg *new_msg;
- TnyHeader *new_header, *header;
+ TnyHeader *new_header;
gchar *new_subject;
- TnyMimePart *body;
+ TnyMimePart *body = NULL;
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 */
- header = tny_msg_get_header (msg);
- body = modest_tny_msg_find_body_part (msg, FALSE);
+ if (header)
+ g_object_ref (header);
+ else
+ header = tny_msg_get_header (msg);
+
+ if (msg != NULL)
+ body = modest_tny_msg_find_body_part (msg, !is_reply);
/* TODO: select the formatter from account prefs */
if (modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_PREFER_FORMATTED_TEXT, NULL))
switch (type) {
case MODEST_TNY_MSG_FORWARD_TYPE_INLINE:
default:
- new_msg = modest_formatter_inline (formatter, body, header, attachments);
+ if (strcmp (tny_mime_part_get_content_type (body), "text/html")==0)
+ new_msg = modest_formatter_attach (formatter, msg, header);
+ else
+ 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);
+ new_msg = modest_formatter_attach (formatter, msg, header);
break;
}
}
g_object_unref (G_OBJECT(formatter));
- g_object_unref (G_OBJECT(body));
+ if (body)
+ g_object_unref (G_OBJECT(body));
/* Fill the header */
new_header = tny_msg_get_header (new_msg);
part = TNY_MIME_PART (data);
attachments_list = ((GList **) user_data);
- if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))
+ if ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part))) {
*attachments_list = g_list_prepend (*attachments_list, part);
+ g_object_ref (part);
+ }
}
TnyMsg*
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, FALSE, forward_type, attachments_list);
+ new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type, attachments_list);
add_attachments (new_msg, attachments_list);
/* Clean */
}
TnyMsg*
-modest_tny_msg_create_reply_msg (TnyMsg *msg,
+modest_tny_msg_create_reply_msg (TnyMsg *msg,
+ TnyHeader *header,
const gchar *from,
const gchar *signature,
ModestTnyMsgReplyType reply_type,
ModestTnyMsgReplyMode reply_mode)
{
TnyMsg *new_msg = NULL;
- TnyHeader *new_header, *header;
+ TnyHeader *new_header;
const gchar* reply_to;
gchar *new_cc = NULL;
const gchar *cc = NULL, *bcc = 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);
+ if (msg != NULL) {
+ 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, attachments_list);
+ new_msg = create_reply_forward_mail (msg, header, 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));
+ if (parts)
+ g_object_unref (G_OBJECT (parts));
/* Fill the header */
- header = tny_msg_get_header (msg);
+ if (header)
+ g_object_ref (header);
+ else
+ header = tny_msg_get_header (msg);
new_header = tny_msg_get_header (new_msg);
reply_to = tny_header_get_replyto (header);
projects / modest / blobdiff