X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-msg.c;h=943f4bc02d1bc4fbd7449a4a9990a1d4e209b0a4;hb=ab02b629212f025c460314340353972a97481448;hp=fb7e5a1bbadc095e95dc675a0db694fe07d5b79f;hpb=b37aa623dad9200d8db98571a59f1418e4699aa9;p=modest

diff --git a/src/modest-tny-msg.c b/src/modest-tny-msg.c
index fb7e5a1..943f4bc 100644
--- a/src/modest-tny-msg.c
+++ b/src/modest-tny-msg.c
@@ -409,9 +409,7 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 	} else {
 		do {
 			gchar *content_type = NULL;
-			gchar *content_disp;
-			gboolean has_content_disp;
-
+			
 			part = TNY_MIME_PART(tny_iterator_get_current (iter));
 
 			if (!part) {
@@ -424,21 +422,15 @@ modest_tny_msg_find_body_part_from_mime_part (TnyMimePart *msg, gboolean want_ht
 				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...
 			 */
 			content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
-			
-			/* mime-parts with a content-disposition header (either 'inline' or 'attachment')
-			 * cannot be body parts
-                         */
-			content_disp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); 
-			has_content_disp = content_disp && strlen (content_disp) != 0;
-			g_free (content_disp);
-			
-			if (g_str_has_prefix (content_type, desired_mime_type) && !has_content_disp) {
+
+			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;
@@ -636,18 +628,18 @@ modest_tny_msg_create_forward_msg (TnyMsg *msg,
 
 
 gchar*
-modest_tny_mime_part_get_header_value (TnyMimePart *part, const gchar *header)
+modest_tny_msg_get_header (TnyMsg *msg, const gchar *header)
 {
 	TnyList *pairs;
 	TnyIterator *iter;
 	gchar *val;
 	
-	g_return_val_if_fail (part && TNY_IS_MIME_PART(part), NULL);
+	g_return_val_if_fail (msg && TNY_IS_MSG(msg), NULL);
 	g_return_val_if_fail (header, NULL);
 
 	pairs = tny_simple_list_new ();
-	
-	tny_mime_part_get_header_pairs (part, pairs);
+
+	tny_mime_part_get_header_pairs (TNY_MIME_PART(msg), pairs);
 	iter = tny_list_create_iterator (pairs);
 
 	val = NULL;
@@ -668,57 +660,6 @@ modest_tny_mime_part_get_header_value (TnyMimePart *part, const gchar *header)
 }
 
 
-/* we consider more things attachments than tinymail does...
- */
-gboolean
-modest_tny_mime_part_is_attachment_for_modest (TnyMimePart *part)
-{
-	gchar *content_disp;
-	gchar *content_type;
-	gboolean has_content_disp;
-
-	g_return_val_if_fail (part && TNY_IS_MIME_PART(part), FALSE);
-	
-	/* if tinymail thinks it's an attachment, it definitely is */
-	if (tny_mime_part_is_attachment (part))
-		return TRUE; 
-
-	/* if the mime part is a message itself (ie. embedded), it's an attachment */
-	if (TNY_IS_MSG (part))
-		return TRUE;
-
-	content_disp = modest_tny_mime_part_get_header_value (part, "Content-Disposition"); 
-	has_content_disp = content_disp && strlen (content_disp) != 0;
-	g_free (content_disp);
-	
-	/* if it doesn't have a content deposition, it's not an attachment */
-	if (!content_disp)
-		return FALSE;
-	
-	/* ok, it must be content-disposition "inline" then, because "attachment"
-	 * is already handle above "...is_attachment". modest consider these "inline" things
-         * attachments as well, unless they are embedded images for html mail 
-	 */
-	content_type = g_ascii_strdown (tny_mime_part_get_content_type (part), -1);
-	if (!g_str_has_prefix (content_type, "image/")) {
-		g_free (content_type);
-		return TRUE; /* it's not an image, so it must be an attachment */
-	}
-	g_free (content_type);
-
-
-	/* now, if it's an inline-image, and it has a content-id or location, we
-	 * we guess it's an inline image, and not an attachment */
-	if (tny_mime_part_get_content_id (part) || tny_mime_part_get_content_location(part))
-		return FALSE;
-		
-	/* in other cases... */
-	return TRUE;
-}
-
-
-
-
 static gint
 count_addresses (const gchar* addresses)
 {
@@ -753,16 +694,14 @@ get_new_to (TnyMsg *msg, TnyHeader *header, const gchar* from,
 	 * for mailing lists, both the Reply-To: and From: should be included
 	 * in the new To:; for now, we're ignoring List-Post
 	 */
-	gchar* list_help = modest_tny_mime_part_get_header_value (TNY_MIME_PART(msg), 
-								  "List-Help");
+	gchar* list_help = modest_tny_msg_get_header (msg, "List-Help");
 	gboolean is_mailing_list = (list_help != NULL);
 	g_free (list_help);
 
 
 	/* 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_reply_to = modest_tny_msg_get_header (msg, "Reply-To"); 
 	old_from     = tny_header_get_from (header);
 	
 	if (!old_from &&  !old_reply_to) {