evolution r35634 - trunk/composer

[mcrha svn gnome org]

Author: mcrha
Date: Fri Jun 13 06:36:22 2008
New Revision: 35634
URL: http://svn.gnome.org/viewvc/evolution?rev=35634&view=rev

Log:
2008-06-13  Milan Crha  <mcrha redhat com>

	** Fix for bug #330597

	* e-msg-composer.c: (add_attachments_handle_mime_part): Add all
	text/* parts which has a filename set and also attach all submessages.



Modified:
   trunk/composer/ChangeLog
   trunk/composer/e-msg-composer.c

Modified: trunk/composer/e-msg-composer.c
==============================================================================
--- trunk/composer/e-msg-composer.c	(original)
+++ trunk/composer/e-msg-composer.c	Fri Jun 13 06:36:22 2008
@@ -3005,12 +3005,10 @@
 		    camel_mime_part_get_content_location (mime_part))
 			e_msg_composer_add_inline_image_from_mime_part (
 				composer, mime_part);
-	} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-		/* do nothing */
 	} else if (related && camel_content_type_is (content_type, "image", "*")) {
 		e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
-	} else if (camel_content_type_is (content_type, "text", "*")) {
-		/* do nothing */
+	} else if (camel_content_type_is (content_type, "text", "*") && camel_mime_part_get_filename (mime_part) == NULL) {
+		/* do nothing if this is a text/anything without filename, otherwise attach it too */
 	} else {
 		e_msg_composer_attach (composer, mime_part);
 	}