#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);
}
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) {
+ if (add_inline) {
+ tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
+ "inline");
+ } else {
+ const gchar *filename;
+ filename = tny_mime_part_get_filename (old_attachment);
+ if (filename)
+ tny_mime_part_set_filename (attachment_part, filename);
+ else
+ tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
+ "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);
}
}
/* no parts? assume it's single-part message */
if (tny_iterator_is_done(iter)) {
- const gchar *content_type;
+ gchar *content_type;
+ gchar *content_type_lower;
+ gboolean is_text_part;
g_object_unref (G_OBJECT(iter));
- content_type = tny_mime_part_get_content_type (msg);
+ content_type = g_strdup (tny_mime_part_get_content_type (msg));
+ if (content_type == NULL)
+ return NULL;
+ content_type = g_strstrip (content_type);
+ content_type_lower = g_ascii_strdown (content_type, -1);
+ g_free (content_type);
+ is_text_part = g_str_has_prefix (content_type_lower, "text/");
+ g_free (content_type_lower);
/* if this part cannot be a supported body return NULL */
- if (!g_str_has_prefix (content_type, "text/")) {
+ if (!is_text_part) {
return NULL;
} else {
return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
g_free (content_disp);
}
- if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp_name) {
+ if (g_str_has_prefix (content_type, desired_mime_type) &&
+ !has_content_disp_name &&
+ !modest_tny_mime_part_is_attachment_for_modest (part)) {
/* we found the desired mime-type! */
g_free (content_type);
break;
/* 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;