X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=e0c303abdffbf2cea80a32e79f079a4e00015468;hp=23990704c997940a3223617d8bf2831c8f5550cf;hb=9dd0650122bcb4bbcd29a28b8cae0343299a71cc;hpb=a31e3b7e2d3779420c9e0b62fc0ffba214137f0e

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 2399070..e0c303a 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -167,12 +167,12 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 
 	if (in_reply_to)
 		tny_mime_part_set_header_pair (TNY_MIME_PART (new_msg), "In-Reply-To", in_reply_to);
-	
-	/* Add the body of the new mail */	
+
+	/* Add the body of the new mail */
 	add_body_part (new_msg, plain_body, content_type);
 	add_html_body_part (new_msg, html_body);
 	g_free (content_type);
-		       
+
 	/* Add attachments */
 	tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
 	if (attached)
@@ -639,6 +639,132 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 		      * part */
 }
 
+static TnyMimePart*
+modest_tny_msg_find_calendar_from_mime_part (TnyMimePart *msg)
+{
+	TnyMimePart *part = NULL;
+	TnyList *parts = NULL;
+	TnyIterator *iter = NULL;
+	gchar *header_content_type;
+	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");
+	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);
+		return NULL;
+	}	
+	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 */
+	if (tny_iterator_is_done(iter)) {
+		gchar *content_type;
+		gboolean is_calendar_part;
+		g_object_unref (G_OBJECT(iter));
+		content_type = modest_tny_mime_part_get_content_type (msg);
+		if (content_type == NULL)
+			return NULL;
+		is_calendar_part = 
+			g_str_has_prefix (content_type, "text/calendar");
+		g_free (content_type);
+		/* if this part cannot be a supported body return NULL */
+		if (!is_calendar_part) {
+			return NULL;
+		} else {
+			return TNY_MIME_PART (g_object_ref(G_OBJECT(msg)));
+		}
+	} else {
+		do {
+			gchar *tmp, *content_type = NULL;
+			gboolean has_content_disp_name = FALSE;
+
+			part = TNY_MIME_PART(tny_iterator_get_current (iter));
+
+			if (!part) {
+				g_warning ("%s: not a valid mime part", __FUNCTION__);
+				tny_iterator_next (iter);
+				continue;
+			}
+
+			/* it's a message --> ignore */
+			if (part && TNY_IS_MSG (part)) {
+				g_object_unref (part);
+				part = NULL;
+				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);
+			
+			/* 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);
+				g_free (tmp);
+				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/calendar") && 
+			    !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;
+
+			} else 	if (g_str_has_prefix(content_type, "multipart")) {
+
+				/* multipart? recurse! */
+				g_object_unref (part);
+				g_free (content_type);
+				part = modest_tny_msg_find_calendar_from_mime_part (part);
+				if (part)
+					break;
+			} 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));
+	}
+	
+	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 */
+}
+
 
 TnyMimePart*
 modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
@@ -649,6 +775,14 @@ modest_tny_msg_find_body_part (TnyMsg *msg, gboolean want_html)
 							     want_html);
 }
 
+TnyMimePart*
+modest_tny_msg_find_calendar (TnyMsg *msg)
+{
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
+	
+	return modest_tny_msg_find_calendar_from_mime_part (TNY_MIME_PART(msg));
+}
+
 
 #define MODEST_TNY_MSG_PARENT_UID "parent-uid"
 
@@ -664,7 +798,6 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	TnyMimePart *body = NULL;
 	TnyMimePart *html_body = NULL;
 	ModestFormatter *formatter;
-	gchar *subject_prefix;
 	gboolean no_text_part;
 	gchar *parent_uid;
 	gboolean forward_as_attach = FALSE;
@@ -718,16 +851,10 @@ create_reply_forward_mail (TnyMsg *msg, TnyHeader *header, const gchar *from,
 	tny_header_set_replyto (new_header, from);
 
 	/* Change the subject */
-	if (is_reply)
-		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 (old_subject,
-							     subject_prefix);
+		(gchar *) modest_text_utils_derived_subject (old_subject, is_reply);
 	g_free (old_subject);
-	g_free (subject_prefix);
 	tny_header_set_subject (new_header, (const gchar *) new_subject);
 	g_free (new_subject);
 
@@ -869,7 +996,7 @@ add_if_attachment (gpointer data, gpointer user_data)
 	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_purged (part) && ((tny_mime_part_is_attachment (part))||(TNY_IS_MSG (part)))) {
 		*attachments_list = g_list_prepend (*attachments_list, part);
 		g_object_ref (part);
 	}
@@ -1158,6 +1285,14 @@ modest_tny_msg_get_references (TnyMsg *msg, gchar **message_id, gchar **referenc
 	}
 }
 
+static void
+remove_line_breaks (gchar *str)
+{
+	gchar *needle = g_strrstr (str, "\r\n");
+	if (needle)
+		*needle = '\0';
+}
+
 static void 
 set_references (TnyMsg *reply_msg, TnyMsg *original_msg)
 {
@@ -1192,14 +1327,18 @@ set_references (TnyMsg *reply_msg, TnyMsg *original_msg)
 	g_free (orig_message_id);
 
 	if (in_reply_to) {
+		remove_line_breaks (in_reply_to);
 		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "In-Reply-To", in_reply_to);
+		g_free (in_reply_to);
 	}
 	if (references) {
+		remove_line_breaks (references);
 		tny_mime_part_set_header_pair (TNY_MIME_PART (reply_msg), "References", references);
+		g_free (references);
 	}
 }
 
-TnyMsg* 
+TnyMsg*
 modest_tny_msg_create_reply_msg (TnyMsg *msg,
 				 TnyHeader *header,
 				 const gchar *from,