[evolution-patches] revert an old fix

[Jeffrey Stedfast <fejj ximian com>]

the old fix tried to be smart about when to add message and text parts
but ti didn't work very well, so this patch restores it to its previous
behaviour.

Jeff

-- 
Jeffrey Stedfast
Evolution Hacker - Ximian, Inc.
fejj ximian com  - www.ximian.com

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/composer/ChangeLog,v
retrieving revision 1.530
diff -u -r1.530 ChangeLog
--- ChangeLog	21 Apr 2003 17:45:52 -0000	1.530
+++ ChangeLog	21 Apr 2003 18:37:10 -0000
@@ -1,5 +1,10 @@
 2003-04-21  Jeffrey Stedfast  <fejj ximian com>
 
+	* e-msg-composer.c (add_attachments_handle_mime_part): Don't ever
+	attach non-inlined text or message parts. Reverts a prior fix.
+
+2003-04-21  Jeffrey Stedfast  <fejj ximian com>
+
 	* e-msg-composer-attachment.glade: Change the order of the
 	ok/cancel buttons.
 
Index: e-msg-composer.c
===================================================================
RCS file: /cvs/gnome/evolution/composer/e-msg-composer.c,v
retrieving revision 1.387
diff -u -r1.387 e-msg-composer.c
--- e-msg-composer.c	19 Apr 2003 22:10:35 -0000	1.387
+++ e-msg-composer.c	21 Apr 2003 18:37:13 -0000
@@ -3142,19 +3142,15 @@
 	if (CAMEL_IS_MULTIPART (wrapper)) {
 		/* another layer of multipartness... */
 		add_attachments_from_multipart (composer, (CamelMultipart *) wrapper, just_inlines, depth + 1);
-	} else if (CAMEL_IS_MIME_MESSAGE (wrapper)) {
-		e_msg_composer_attach (composer, mime_part);
 	} else if (just_inlines) {
 		if (camel_mime_part_get_content_id (mime_part) ||
 		    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 (header_content_type_is (content_type, "text", "*")) {
-			const char *disposition;
-			
-			disposition = camel_mime_part_get_disposition (mime_part);
-			if (disposition && !strcasecmp (disposition, "attachment"))
-				e_msg_composer_attach (composer, mime_part);
+			/* do nothing */
 		} else {
 			e_msg_composer_attach (composer, mime_part);
 		}