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 (TnyMsg *msg, GList *attachments_list);
+static void add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline);
+static void add_images (TnyMsg *msg, GList *attachments_list);
static char * get_content_type(const gchar *s);
static gboolean is_ascii(const gchar *s);
gchar *content_type;
/* Create new msg */
- new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL));
+ new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
/* Add attachments */
if (attachments)
- add_attachments (new_msg, attachments);
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
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,
- GList *attachments)
+ GList *attachments, GList *images)
{
TnyMsg *new_msg;
TnyHeader *header;
gchar *content_type;
/* Create new msg */
- new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL));
+ new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL));
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
g_free (content_type);
/* Add attachments */
- add_attachments (new_msg, attachments);
+ add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE);
+ add_images (new_msg, images);
return new_msg;
}
}
static void
-add_attachments (TnyMsg *msg, GList *attachments_list)
+add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline)
{
GList *pos;
TnyMimePart *attachment_part, *old_attachment;
old_attachment = pos->data;
if (!tny_mime_part_is_purged (old_attachment)) {
attachment_part = copy_mime_part (old_attachment);
- tny_mime_part_add_part (TNY_MIME_PART (msg), attachment_part);
+ tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
+ tny_mime_part_set_header_pair (attachment_part, "Content-Disposition",
+ add_inline?"inline":"attachment");
g_object_unref (attachment_part);
}
}
}
+static void
+add_images (TnyMsg *msg, GList *images_list)
+{
+ TnyMimePart *related_part = NULL;
+ const gchar *content_type;
+
+ content_type = tny_mime_part_get_content_type (TNY_MIME_PART (msg));
+
+ if ((content_type != NULL) && !strcasecmp (content_type, "multipart/related")) {
+ related_part = g_object_ref (msg);
+ } else if ((content_type != NULL) && !strcasecmp (content_type, "multipart/mixed")) {
+ TnyList *parts = TNY_LIST (tny_simple_list_new ());
+ TnyIterator *iter = NULL;
+ tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+ iter = tny_list_create_iterator (parts);
+
+ while (!tny_iterator_is_done (iter)) {
+ TnyMimePart *part = TNY_MIME_PART (tny_iterator_get_current (iter));
+ if (part && !g_strcasecmp (tny_mime_part_get_content_type (part), "multipart/related")) {
+ related_part = part;
+ break;
+ } else {
+ g_object_unref (part);
+ }
+ tny_iterator_next (iter);
+ }
+ g_object_unref (iter);
+ g_object_unref (parts);
+ }
+
+ if (related_part != NULL) {
+ /* TODO: attach images in their proper place */
+ add_attachments (related_part, images_list, TRUE);
+ }
+}
+
gchar *
modest_tny_msg_get_body (TnyMsg *msg, gboolean want_html, gboolean *is_html)
TnyMimePart*
modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
{
- const gchar *mime_type = want_html ? "text/html" : "text/plain";
+ const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
TnyMimePart *part = NULL;
TnyList *parts = NULL;
TnyIterator *iter = NULL;
-
+
if (!msg)
return NULL;
g_object_unref (G_OBJECT(iter));
return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
} else {
- gchar *content_type = NULL;
do {
+ gchar *content_type = NULL;
+
part = TNY_MIME_PART(tny_iterator_get_current (iter));
+
+ if (!part) {
+ g_warning ("%s: not a valid mime part", __FUNCTION__);
+ continue;
+ }
+
+ /* it's a message --> ignore */
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...
*/
- 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))
+ content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
+
+ if (g_str_has_prefix (content_type, desired_mime_type) && !tny_mime_part_is_attachment (part)) {
+ /* we found the desired mime-type! */
+ g_free (content_type);
break;
-
- if (g_str_has_prefix(content_type, "multipart")) {
+
+ } else if (g_str_has_prefix(content_type, "multipart")) {
+
+ /* multipart? recurse! */
+ g_object_unref (part);
+ g_free (content_type);
part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
if (part)
break;
- }
-
- if (part)
+ } else
+ g_free (content_type);
+
+ if (part) {
g_object_unref (G_OBJECT(part));
-
- part = NULL;
+ part = NULL;
+ }
- g_free (content_type);
- content_type = NULL;
-
tny_iterator_next (iter);
} while (!tny_iterator_is_done(iter));
- g_free (content_type);
}
g_object_unref (G_OBJECT(iter));
new_msg = create_reply_forward_mail (msg, NULL, from, signature, FALSE, forward_type,
attachments_list);
- add_attachments (new_msg, attachments_list);
+ add_attachments (TNY_MIME_PART (new_msg), attachments_list, FALSE);
/* Clean */
if (attachments_list)