#include <tny-folder.h>
#include <modest-runtime.h>
#include "modest-formatter.h"
-#include <tny-camel-stream.h>
+#include <tny-camel-mem-stream.h>
#include <tny-camel-mime-part.h>
-#include <camel/camel-stream-buffer.h>
-#include <camel/camel-stream-mem.h>
#include <glib/gprintf.h>
#include <modest-tny-folder.h>
#include "modest-tny-mime-part.h"
+#include <modest-error.h>
#ifdef HAVE_CONFIG_H
static TnyMimePart * add_body_part (TnyMsg *msg, const gchar *body,
const gchar *content_type);
static TnyMimePart * add_html_body_part (TnyMsg *msg, const gchar *body);
-static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline);
-static void add_images (TnyMsg *msg, GList *attachments_list);
+static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err);
+static void add_images (TnyMsg *msg, GList *attachments_list, GError **err);
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,
- GList *attachments)
+ GList *attachments, GError **err)
{
TnyMsg *new_msg;
TnyHeader *header;
/* Add attachments */
if (attachments)
- add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
if (header)
g_object_unref(header);
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,
- GList *attachments, GList *images)
+ GList *attachments, GList *images, GError **err)
{
TnyMsg *new_msg;
TnyHeader *header;
g_free (content_type);
/* Add attachments */
- add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
- add_images (new_msg, images);
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+ add_images (new_msg, images, err);
if (header)
g_object_unref(header);
TnyStream *text_body_stream;
/* Create the stream */
- text_body_stream = TNY_STREAM (tny_camel_stream_new
- (camel_stream_mem_new_with_buffer
- (body, (body ? strlen(body) : 0))));
+ text_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (body, (body ? strlen(body) : 0)));
text_body_part = modest_formatter_create_body_part (NULL, msg);
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))));
+ html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
+ (body, strlen(body)));
/* Create body part if needed */
html_body_part = modest_formatter_create_body_part (NULL, msg);
}
static TnyMimePart *
-copy_mime_part (TnyMimePart *part)
+copy_mime_part (TnyMimePart *part, GError **err)
{
TnyMimePart *result = NULL;
const gchar *attachment_content_type;
TnyIterator *iterator;
TnyStream *attachment_stream;
const gchar *enc;
+ gint ret;
if (TNY_IS_MSG (part)) {
g_object_ref (part);
/* fill the stream */
attachment_stream = tny_mime_part_get_decoded_stream (part);
enc = tny_mime_part_get_transfer_encoding (part);
- tny_stream_reset (attachment_stream);
- tny_mime_part_construct (result,
- attachment_stream,
- attachment_content_type,
- enc);
- tny_stream_reset (attachment_stream);
+ if (attachment_stream == NULL) {
+ if (err != NULL && *err == NULL)
+ g_set_error (err, MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FILE_IO, _("TODO: couldn't retrieve attachment"));
+ g_object_unref (result);
+ return NULL;
+ } else {
+ ret = tny_stream_reset (attachment_stream);
+ ret = tny_mime_part_construct (result,
+ attachment_stream,
+ attachment_content_type,
+ enc);
+ ret = tny_stream_reset (attachment_stream);
+ }
/* set other mime part fields */
tny_mime_part_set_filename (result, attachment_filename);
TnyMimePart *subpart = TNY_MIME_PART (tny_iterator_get_current (iterator));
if (subpart) {
const gchar *subpart_cid;
- TnyMimePart *subpart_copy = copy_mime_part (subpart);
- subpart_cid = tny_mime_part_get_content_id (subpart);
- tny_mime_part_add_part (result, subpart_copy);
- if (subpart_cid)
- tny_mime_part_set_content_id (result, subpart_cid);
+ TnyMimePart *subpart_copy = copy_mime_part (subpart, err);
+ if (subpart_copy != NULL) {
+ subpart_cid = tny_mime_part_get_content_id (subpart);
+ tny_mime_part_add_part (result, subpart_copy);
+ if (subpart_cid)
+ tny_mime_part_set_content_id (result, subpart_cid);
+ g_object_unref (subpart_copy);
+ }
g_object_unref (subpart);
- g_object_unref (subpart_copy);
}
tny_iterator_next (iterator);
}
static void
-add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline)
+add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err)
{
GList *pos;
TnyMimePart *attachment_part, *old_attachment;
+ gint ret;
for (pos = (GList *)attachments_list; pos; pos = pos->next) {
if (!tny_mime_part_is_purged (old_attachment)) {
const gchar *old_cid;
old_cid = tny_mime_part_get_content_id (old_attachment);
- attachment_part = copy_mime_part (old_attachment);
- tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
- add_inline?"inline":"attachment");
- tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
- tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
- if (old_cid)
- tny_mime_part_set_content_id (attachment_part, old_cid);
- g_object_unref (attachment_part);
+ attachment_part = copy_mime_part (old_attachment, err);
+ if (attachment_part != NULL) {
+ tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
+ add_inline?"inline":"attachment");
+ tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
+ ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
+ if (old_cid)
+ tny_mime_part_set_content_id (attachment_part, old_cid);
+ g_object_unref (attachment_part);
+ }
}
}
}
static void
-add_images (TnyMsg *msg, GList *images_list)
+add_images (TnyMsg *msg, GList *images_list, GError **err)
{
TnyMimePart *related_part = NULL;
const gchar *content_type;
if (related_part != NULL) {
/* TODO: attach images in their proper place */
- add_attachments (related_part, images_list, TRUE);
+ add_attachments (related_part, images_list, TRUE, err);
g_object_unref (related_part);
}
}
TnyList *parts = NULL;
TnyIterator *iter = NULL;
gchar *header_content_type;
- gchar *header_content_type_lower;
+ gchar *header_content_type_lower = NULL;
if (!msg)
return NULL;
/* If it's an application multipart, then we don't get into as we don't
* support them (for example application/sml or wap messages */
header_content_type = modest_tny_mime_part_get_header_value (msg, "Content-Type");
- header_content_type = g_strstrip (header_content_type);
- header_content_type_lower = header_content_type?g_ascii_strdown (header_content_type, -1):NULL;
+ if (header_content_type) {
+ header_content_type = g_strstrip (header_content_type);
+ header_content_type_lower = g_ascii_strdown (header_content_type, -1);
+ }
if (header_content_type_lower &&
g_str_has_prefix (header_content_type_lower, "multipart/") &&
+ !g_str_has_prefix (header_content_type_lower, "multipart/signed") &&
strstr (header_content_type_lower, "application/")) {
g_free (header_content_type_lower);
g_free (header_content_type);
{
TnyMsg *new_msg;
TnyHeader *new_header;
+ gchar *old_subject;
gchar *new_subject;
TnyMimePart *body = NULL;
ModestFormatter *formatter;
subject_prefix = g_strconcat (_("mail_va_re"), ":", NULL);
else
subject_prefix = g_strconcat (_("mail_va_fw"), ":", NULL);
+ old_subject = tny_header_dup_subject (header);
new_subject =
- (gchar *) modest_text_utils_derived_subject (tny_header_get_subject(header),
+ (gchar *) modest_text_utils_derived_subject (old_subject,
subject_prefix);
+ g_free (old_subject);
g_free (subject_prefix);
tny_header_set_subject (new_header, (const gchar *) new_subject);
g_free (new_subject);
/* ugly to unref it here instead of in the calling func */
if (!is_reply & !no_text_part) {
- add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, NULL);
}
return new_msg;
ModestTnyMsgReplyMode reply_mode)
{
const gchar* old_reply_to;
- const gchar* old_from;
+ gchar* old_from;
gchar* new_to;
/* according to RFC2369 (http://www.faqs.org/rfcs/rfc2369.html), we
//old_reply_to = tny_header_get_replyto (header);
old_reply_to = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg),
"Reply-To");
- old_from = tny_header_get_from (header);
+ old_from = tny_header_dup_from (header);
if (!old_from && !old_reply_to) {
g_warning ("%s: failed to get either Reply-To: or From: from header",
else
/* otherwise use either Reply-To: (preferred) or From: */
new_to = g_strdup (old_reply_to ? old_reply_to : old_from);
+ g_free (old_from);
/* in case of ReplyAll, we need to add the Recipients in the old To: */
if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {
- const gchar *old_to = tny_header_get_to (header);
+ gchar *old_to = tny_header_dup_to (header);
if (!old_to)
g_warning ("%s: no To: address found in source mail",
__FUNCTION__);
gchar *tmp = g_strjoin (",", new_to, old_to, NULL);
g_free (new_to);
new_to = tmp;
+ g_free (old_to);
}
/* remove duplicate entries */
static gchar*
get_new_cc (TnyHeader *header, const gchar* from)
{
- const gchar *old_cc;
+ gchar *old_cc;
+ gchar *result;
- old_cc = tny_header_get_cc (header);
+ old_cc = tny_header_dup_cc (header);
if (!old_cc)
return NULL;
/* remove me (the new From:) from the Cc: list */
- return modest_text_utils_remove_address (old_cc, from);
+ result = modest_text_utils_remove_address (old_cc, from);
+ g_free (old_cc);
+ return result;
}
new_msg = create_reply_forward_mail (msg, header, from, signature, TRUE, reply_type,
attachments_list);
- if (attachments_list) {
+ if (attachments_list != NULL) {
g_list_foreach (attachments_list, (GFunc) g_object_unref, NULL);
g_list_free (attachments_list);
}