aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/e-msg-composer-attachment.c8
2 files changed, 13 insertions, 1 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 81bf1550ef..dc4d727a8c 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-27 Jeffrey Stedfast <fejj@ximian.com>
+
+ * e-msg-composer-attachment.c (e_msg_composer_attachment_new):
+ Don't set Content-Ids on these parts since they are not contained
+ within a multipart/related - this fixes bug #10032.
+
2001-09-26 Jon Trowbridge <trow@ximian.com>
* e-msg-composer.c (e_msg_composer_new_from_url): Fixes glitch in
diff --git a/composer/e-msg-composer-attachment.c b/composer/e-msg-composer-attachment.c
index 1c03b0ff35..9231137317 100644
--- a/composer/e-msg-composer-attachment.c
+++ b/composer/e-msg-composer-attachment.c
@@ -193,11 +193,17 @@ e_msg_composer_attachment_new (const gchar *file_name,
camel_mime_part_set_filename (part, filename);
g_free (filename);
-
+
+#if 0
+ /* Note: Outlook 2002 is broken with respect to Content-Ids on
+ non-multipart/related parts, so as an interoperability
+ workwaround, don't set a Content-Id on these parts. Fixes
+ bug #10032 */
/* set the Content-Id */
content_id = header_msgid_generate ();
camel_mime_part_set_content_id (part, content_id);
g_free (content_id);
+#endif
new = e_msg_composer_attachment_new_from_mime_part (part);