aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/e-msg-composer.c10
2 files changed, 8 insertions, 7 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index fbcc50a7fb..13905ff421 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -10,6 +10,11 @@
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.
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 8b1c70de90..c1fbf8ff1d 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3142,21 +3142,17 @@ add_attachments_handle_mime_part (EMsgComposer *composer, CamelMimePart *mime_pa
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 (related && header_content_type_is (content_type, "image", "*")) {
e_msg_composer_add_inline_image_from_mime_part (composer, mime_part);
} 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);
}