aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilan Crha <mcrha@redhat.com>2008-06-13 14:36:22 +0800
committerMilan Crha <mcrha@src.gnome.org>2008-06-13 14:36:22 +0800
commit5868f85aff119c14b15acecb22afae575b863a57 (patch)
tree56ca72d79e1111ff7dc939c9f88e180b51fbae75
parent00e55f86dfdec77459ca98e80bdc73aecad0bf84 (diff)
downloadgsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar.gz
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar.bz2
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar.lz
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar.xz
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.tar.zst
gsoc2013-evolution-5868f85aff119c14b15acecb22afae575b863a57.zip
** Fix for bug #330597
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. svn path=/trunk/; revision=35634
-rw-r--r--composer/ChangeLog7
-rw-r--r--composer/e-msg-composer.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index d1fa8ef034..4c0ee3a144 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,10 @@
+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.
+
2008-05-08 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #525241 (EPluginUI)
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 2dbfcc92d4..cc92fdf8b7 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -3005,12 +3005,10 @@ add_attachments_handle_mime_part (EMsgComposer *composer,
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);
}