static char * get_content_type(const gchar *s);
static gboolean is_ascii(const gchar *s);
+static TnyMimePart* modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html);
+static TnyMimePart* modest_tny_msg_find_calendar_from_mime_part (TnyMimePart *msg);
+
+static void
+add_header_pairs (TnyMimePart *part, TnyList *header_pairs)
+{
+ TnyIterator *iterator;
+
+ iterator = tny_list_create_iterator (header_pairs);
+ while (!tny_iterator_is_done (iterator)) {
+ TnyPair *current = (TnyPair *) tny_iterator_get_current (iterator);
+ tny_mime_part_set_header_pair (part, tny_pair_get_name (current), tny_pair_get_value (current));
+ g_object_unref (current);
+ tny_iterator_next (iterator);
+ }
+ g_object_unref (iterator);
+}
TnyMsg*
modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
const gchar *bcc, const gchar* subject,
const gchar *references, const gchar *in_reply_to,
const gchar *body,
- GList *attachments, gint *attached, GError **err)
+ GList *attachments, gint *attached, TnyList *header_pairs, GError **err)
{
TnyMsg *new_msg;
TnyHeader *header;
/* Create new msg */
new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
+ add_header_pairs (TNY_MIME_PART (new_msg), header_pairs);
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
const gchar *bcc, const gchar* subject,
const gchar *references, const gchar *in_reply_to,
const gchar *html_body, const gchar *plain_body,
- GList *attachments, GList *images, gint *attached, GError **err)
+ GList *attachments, GList *images, gint *attached, TnyList *header_pairs, GError **err)
{
TnyMsg *new_msg;
TnyHeader *header;
/* Create new msg */
new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL));
+ add_header_pairs (TNY_MIME_PART (new_msg), header_pairs);
header = tny_msg_get_header (new_msg);
if ((from != NULL) && (strlen(from) > 0)) {
/* Create the stream */
html_body_stream = TNY_STREAM (tny_camel_mem_stream_new_with_buffer
- (body, strlen(body)));
+ (body, (body) ? strlen(body) : 0));
/* Create body part if needed */
html_body_part = modest_formatter_create_body_part (NULL, msg);
{
TnyList *parts;
TnyIterator *iter;
- TnyMimePart *part = NULL;
+ TnyMimePart *part = NULL, *related = NULL;
TnyMimePart *first_part = NULL;
const gchar *desired_mime_type = want_html ? "text/html" : "text/plain";
parts = TNY_LIST (tny_simple_list_new());
tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
- for (iter = tny_list_create_iterator(parts);
+ for (iter = tny_list_create_iterator(parts);
!tny_iterator_is_done (iter);
tny_iterator_next (iter)) {
gchar *content_type;
if (is_body)
break;
+ /* Makes no sense to look for related MIME parts if we
+ only want the plain text parts */
+ if (want_html && g_str_has_prefix (content_type, "multipart/related")) {
+ /* In an alternative the last part is supposed
+ to be the richest */
+ if (related)
+ g_object_unref (related);
+ related = g_object_ref (part);
+ }
+
g_object_unref (part);
part = NULL;
g_object_unref (parts);
if (part == NULL) {
- return first_part;
+ if (related) {
+ TnyMimePart *retval;
+ if (first_part)
+ g_object_unref (first_part);
+ retval = modest_tny_msg_find_body_part_from_mime_part (related, want_html);
+ g_object_unref (related);
+ return retval;
+ } else {
+ return first_part;
+ }
} else {
- if (first_part) g_object_unref (first_part);
+ if (first_part)
+ g_object_unref (first_part);
+ if (related)
+ g_object_unref (related);
return part;
}
}
-TnyMimePart*
+static TnyMimePart*
modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_html)
{
TnyMimePart *part = NULL;
TnyIterator *iter = NULL;
gchar *header_content_type;
gchar *header_content_type_lower = NULL;
-
+ gboolean is_related = FALSE;
+
if (!msg)
return NULL;
header_content_type = g_strstrip (header_content_type);
header_content_type_lower = g_ascii_strdown (header_content_type, -1);
}
- if (header_content_type_lower &&
+ 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);
return NULL;
- }
+ }
if (header_content_type_lower &&
g_str_has_prefix (header_content_type_lower, "multipart/alternative")) {
g_free (header_content_type_lower);
g_free (header_content_type);
return modest_tny_msg_find_body_part_in_alternative (msg, want_html);
- }
+ }
+
+ if (header_content_type_lower &&
+ g_str_has_prefix (header_content_type_lower, "multipart/related"))
+ is_related = TRUE;
+
g_free (header_content_type_lower);
g_free (header_content_type);
parts = TNY_LIST (tny_simple_list_new());
tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
- iter = tny_list_create_iterator(parts);
-
/* no parts? assume it's single-part message */
+ iter = tny_list_create_iterator (parts);
if (tny_iterator_is_done(iter)) {
gchar *content_type;
gboolean is_text_part;
- g_object_unref (G_OBJECT(iter));
+
content_type = modest_tny_mime_part_get_content_type (msg);
if (content_type == NULL)
- return NULL;
- is_text_part =
- g_str_has_prefix (content_type, "text/");
+ goto frees;
+ is_text_part = g_str_has_prefix (content_type, "text/");
g_free (content_type);
+
/* if this part cannot be a supported body return NULL */
- if (!is_text_part) {
- return NULL;
- } else {
- return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
- }
+ if (is_text_part)
+ part = TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
} else {
+ TnyMimePart *fallback = NULL;
do {
gchar *tmp, *content_type = NULL;
gboolean has_content_disp_name = FALSE;
* tny_mime_part_has_content_type does not do it...
*/
content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
-
+
/* mime-parts with a content-disposition header (either 'inline' or 'attachment')
* and a 'name=' thingy cannot be body parts
*/
-
+
tmp = modest_tny_mime_part_get_header_value (part, "Content-Disposition");
if (tmp) {
gchar *content_disp = g_ascii_strdown(tmp, -1);
has_content_disp_name = g_strstr_len (content_disp, strlen(content_disp), "name=") != NULL;
g_free (content_disp);
}
-
- if (g_str_has_prefix (content_type, "text/") &&
+
+ if (g_str_has_prefix (content_type, "text/") &&
!has_content_disp_name &&
!modest_tny_mime_part_is_attachment_for_modest (part)) {
- /* we found the body. Doesn't have to be the desired mime part, first
- text/ part in a mixed is the body */
- g_free (content_type);
- break;
-
+ /* We found that some multipart/related emails include
+ empty text/plain parts at the end that could confuse the body
+ detection algorithm */
+ if (is_related && g_str_has_prefix (content_type, "text/plain")) {
+ fallback = g_object_ref (part);
+ } else {
+ /* we found the body. Doesn't have to be the desired mime part, first
+ text/ part in a multipart/mixed is the body */
+ g_free (content_type);
+ break;
+ }
} else if (g_str_has_prefix(content_type, "multipart/alternative")) {
/* multipart? recurse! */
part = modest_tny_msg_find_body_part_from_mime_part (part, want_html);
if (part)
break;
- } else
+ } else {
g_free (content_type);
-
+ }
+
if (part) {
g_object_unref (G_OBJECT(part));
part = NULL;
}
-
tny_iterator_next (iter);
-
+
} while (!tny_iterator_is_done(iter));
+
+ if (!part && fallback)
+ part = g_object_ref (fallback);
+ if (fallback)
+ g_object_unref (fallback);
}
-
+
+ frees:
g_object_unref (G_OBJECT(iter));
g_object_unref (G_OBJECT(parts));
- return part; /* this maybe NULL, this is not an error; some message just don't have a body
- * part */
+ return part;
}
static TnyMimePart*
projects / modest / blobdiff