0.9.7claws43

use "name" parameter if "filename" doesn't exist

diff --git a/src/mimeview.c b/src/mimeview.c
index 7a89249a6afacfe5203fc16f302802b968e13675..9fd1f207fcef146b2509bbf93969e7ef133f29fd 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -532,6 +532,8 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
                const gchar *filename;
 
                filename = procmime_mimeinfo_get_parameter(partinfo, "filename");
+               if (filename == NULL)
+                       filename = procmime_mimeinfo_get_parameter(partinfo, "name");
                if (filename != NULL)
                        content_type = procmime_get_mime_type(filename);
        } else {

diff --git a/src/textview.c b/src/textview.c
index 0e5cc0a9f4564e1b28e9376c5af3c654720325e4..774c6177d3bf886ae0b1931c718ea7de6298af2b 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -411,6 +411,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        gchar buf[BUFFSIZE];
        const gchar *charset = NULL;
        GPtrArray *headers = NULL;
+       const gchar *name;
 
        g_return_if_fail(mimeinfo != NULL);
 
@@ -436,9 +437,12 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        gtk_stext_freeze(text);
 
-       if (g_hash_table_lookup(mimeinfo->parameters, "filename") != NULL)
+       name = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
+       if (name == NULL)
+               name = procmime_mimeinfo_get_parameter(mimeinfo, "name");
+       if (name != NULL)
                g_snprintf(buf, sizeof(buf), "\n[%s  %s/%s (%d bytes)]\n",
-                          (gchar *) g_hash_table_lookup(mimeinfo->parameters, "filename"),
+                          name,
                           procmime_get_type_str(mimeinfo->type),
                           mimeinfo->subtype, mimeinfo->length);
        else