X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=db282e1890e4cd7557a632b27ca6b2587bb65718;hb=7ec3145b6e5eb9e748ecae0c0b1d9dad897268a9;hp=8c8089ae9463c6a15f9f6f402bfe7008a1687c91;hpb=7c0f4342a5d9469e6799a96551e79be5ba6b849c;p=modest

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index 8c8089a..db282e1 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -52,7 +52,7 @@
 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, GError **err);
+static gint 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);
@@ -61,11 +61,12 @@ 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, GError **err)
+		    GList *attachments, gint *attached, GError **err)
 {
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
+	gint tmp_attached = 0;
 	
 	/* Create new msg */
 	new_msg = modest_formatter_create_message (NULL, TRUE, (attachments != NULL), FALSE);
@@ -75,8 +76,11 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		tny_header_set_from (TNY_HEADER (header), from);
 		tny_header_set_replyto (TNY_HEADER (header), from);
 	}
-	if ((mailto != NULL) && (strlen(mailto) > 0)) 
-		tny_header_set_to (TNY_HEADER (header), mailto);
+	if ((mailto != NULL) && (strlen(mailto) > 0)) {
+		gchar *removed_to = modest_text_utils_remove_duplicate_addresses (mailto);
+		tny_header_set_to (TNY_HEADER (header), removed_to);
+		g_free (removed_to);
+	}
 	if ((cc != NULL) && (strlen(cc) > 0)) 
 		tny_header_set_cc (TNY_HEADER (header), cc);
 	if ((bcc != NULL) && (strlen(bcc) > 0)) 
@@ -101,7 +105,9 @@ modest_tny_msg_new (const gchar* mailto, const gchar* from, const gchar *cc,
 		       
 	/* Add attachments */
 	if (attachments)
-		add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+		tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+	if (attached)
+		*attached = tmp_attached;
 	if (header)
 		g_object_unref(header);
 
@@ -112,11 +118,12 @@ TnyMsg*
 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, GError **err)
+			       GList *attachments, GList *images, gint *attached, GError **err)
 {
 	TnyMsg *new_msg;
 	TnyHeader *header;
 	gchar *content_type;
+	gint tmp_attached;
 	
 	/* Create new msg */
 	new_msg = modest_formatter_create_message (NULL, FALSE, (attachments != NULL), (images != NULL));
@@ -151,7 +158,9 @@ modest_tny_msg_new_html_plain (const gchar* mailto, const gchar* from, const gch
 	g_free (content_type);
 		       
 	/* Add attachments */
-	add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+	tmp_attached = add_attachments (TNY_MIME_PART (new_msg), attachments, FALSE, err);
+	if (attached)
+		*attached = tmp_attached;
 	add_images (new_msg, images, err);
 	if (header)
 		g_object_unref(header);
@@ -297,12 +306,13 @@ copy_mime_part (TnyMimePart *part, GError **err)
 	return result;
 }
 
-static void
+static gint
 add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline, GError **err)
 {
 	GList *pos;
 	TnyMimePart *attachment_part, *old_attachment;
 	gint ret;
+	gint attached = 0;
 
 	for (pos = (GList *)attachments_list; pos; pos = pos->next) {
 
@@ -326,12 +336,14 @@ add_attachments (TnyMimePart *part, GList *attachments_list, gboolean add_inline
 				}
 				tny_mime_part_set_transfer_encoding (TNY_MIME_PART (attachment_part), "base64");
 				ret = tny_mime_part_add_part (TNY_MIME_PART (part), attachment_part);
+				attached++;
 				if (old_cid)
 					tny_mime_part_set_content_id (attachment_part, old_cid);
 				g_object_unref (attachment_part);
 			}
 		}
 	}
+	return attached;
 }
 
 static void
@@ -441,7 +453,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 		g_free (header_content_type_lower);
 		g_free (header_content_type);
 		return NULL;
-	}
+	}	
 	g_free (header_content_type_lower);
 	g_free (header_content_type);
 
@@ -462,7 +474,9 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 		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/");
+		is_text_part = 
+			g_str_has_prefix (content_type_lower, "text/") ||
+			g_str_has_prefix (content_type_lower, "message/rfc822");
 		g_free (content_type_lower);
 		/* if this part cannot be a supported body return NULL */
 		if (!is_text_part) {
@@ -485,6 +499,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 			/* it's a message --> ignore */
 			if (part && TNY_IS_MSG (part)) {
 				g_object_unref (part);
+				part = NULL;
 				tny_iterator_next (iter);
 				continue;
 			}			
@@ -506,7 +521,9 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				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;
@@ -738,7 +755,7 @@ static gchar*
 get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	    ModestTnyMsgReplyMode reply_mode)
 {
-	const gchar* old_reply_to;
+	gchar* old_reply_to;
 	gchar* old_from;
 	gchar* new_to;
 	
@@ -754,12 +771,11 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 
 
 	/* reply to sender, use ReplyTo or From */
-	//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_dup_from (header);
 	
-	if (!old_from &&  !old_reply_to) {
+	if (!old_from && !old_reply_to) {
 		g_warning ("%s: failed to get either Reply-To: or From: from header",
 			   __FUNCTION__);
 		return NULL;
@@ -775,6 +791,7 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 		/* otherwise use either Reply-To: (preferred) or From: */
 		new_to = g_strdup (old_reply_to ? old_reply_to : old_from);
 	g_free (old_from);
+	g_free (old_reply_to);
 
 	/* in case of ReplyAll, we need to add the Recipients in the old To: */
 	if (reply_mode == MODEST_TNY_MSG_REPLY_MODE_ALL) {