[evolution-data-server/gnome-3-16] Bug 749108 - Embedded inline images pretend message attachments

[Milan Crha <mcrha src gnome org>]

commit 8b3d8a6d672cdcd737d8797d1e70dbfbb66646a9
Author: Milan Crha <mcrha redhat com>
Date:   Wed May 13 18:11:36 2015 +0200

    Bug 749108 - Embedded inline images pretend message attachments

 camel/camel-mime-message.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/camel/camel-mime-message.c b/camel/camel-mime-message.c
index 023bd49..a633210 100644
--- a/camel/camel-mime-message.c
+++ b/camel/camel-mime-message.c
@@ -1310,9 +1310,11 @@ find_attachment (CamelMimeMessage *msg,
 
                *found = (cd->disposition && g_ascii_strcasecmp (cd->disposition, "attachment") == 0);
 
-               for (param = cd->params; param && !(*found); param = param->next) {
-                       if (param->name && param->value && *param->value && g_ascii_strcasecmp (param->name, 
"filename") == 0)
-                               *found = TRUE;
+               if (!*found && (!cd->disposition || g_ascii_strcasecmp (cd->disposition, "inline") != 0)) {
+                       for (param = cd->params; param && !(*found); param = param->next) {
+                               if (param->name && param->value && *param->value && g_ascii_strcasecmp 
(param->name, "filename") == 0)
+                                       *found = TRUE;
+                       }
                }
        }