[evolution/gnome-3-6] EAttachment: Use Subject as fallback filename for message attachments

[Milan Crha <mcrha src gnome org>]

commit f61b0bb332c789bc050452355defd6ce654a7c43
Author: Milan Crha <mcrha redhat com>
Date:   Wed Feb 20 12:01:43 2013 +0100

    EAttachment: Use Subject as fallback filename for message attachments

 widgets/misc/e-attachment.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/widgets/misc/e-attachment.c b/widgets/misc/e-attachment.c
index 8a4ff29..14527fd 100644
--- a/widgets/misc/e-attachment.c
+++ b/widgets/misc/e-attachment.c
@@ -1840,6 +1840,27 @@ attachment_load_from_mime_part_thread (GSimpleAsyncResult *simple,
        if (string == NULL) {
                /* Translators: Default attachment filename. */
                string = _("attachment.dat");
+
+               if (camel_content_type_is (content_type, "message", "rfc822")) {
+                       CamelMimeMessage *msg = NULL;
+                       const gchar *subject = NULL;
+
+                       if (CAMEL_IS_MIME_MESSAGE (mime_part)) {
+                               msg = CAMEL_MIME_MESSAGE (mime_part);
+                       } else {
+                               CamelDataWrapper *content;
+
+                               content = camel_medium_get_content (CAMEL_MEDIUM (mime_part));
+                               if (CAMEL_IS_MIME_MESSAGE (content))
+                                       msg = CAMEL_MIME_MESSAGE (content);
+                       }
+
+                       if (msg)
+                               subject = camel_mime_message_get_subject (msg);
+
+                       if (subject && *subject)
+                               string = subject;
+               }
        } else {
                decoded_string = camel_header_decode_string (string, "UTF-8");
                if (decoded_string && *decoded_string && !g_str_equal (decoded_string, string)) {