0.9.6claws85

* src/mimeview.c
        fix content-type guessing by name parameter when finding
        the correct viewer

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 8ee304c89ac894645bc79f45740b72064c9c1a68..ce702cfa16863fcd043056ae924a869d5c1b83ca 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,9 +1,15 @@
+2003-11-21 [christoph] 0.9.6claws85
+
+       * src/mimeview.c
+               fix content-type guessing by name parameter when finding
+               the correct viewer
+

 2003-11-21 [alfons]    0.9.6claws84
 
        * src/main.c
                no mail incorporation allowed with --offline param.
                fixes bug #374, "--offline ignored"
 2003-11-21 [alfons]    0.9.6claws84
 
        * src/main.c
                no mail incorporation allowed with --offline param.
                fixes bug #374, "--offline ignored"

-               
+

 2003-11-20 [christoph] 0.9.6claws83
 
        * src/mimeinfo.c
 2003-11-20 [christoph] 0.9.6claws83
 
        * src/mimeinfo.c

diff --git a/configure.ac b/configure.ac
index 3999de510cf00b2c335e7bc0e4a9d35dc37e8f59..95ff0ab68a447230d465141bedacccd15ee20c27 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=84
+EXTRA_VERSION=85

 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else

diff --git a/src/mimeview.c b/src/mimeview.c
index 13e01b6497776f9e6cfab34b3c186a155b411c65..3f5b7811de1b0992b549282b39f7960afe5311d0 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -528,9 +528,12 @@ static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinf
        MimeViewer *viewer = NULL;
 
        if ((partinfo->type == MIMETYPE_APPLICATION) &&
        MimeViewer *viewer = NULL;
 
        if ((partinfo->type == MIMETYPE_APPLICATION) &&

-            (!g_strcasecmp(partinfo->subtype, "octet-stream")) &&
-           (partinfo->name != NULL)) {
-               content_type = procmime_get_mime_type(partinfo->name);
+            (!g_strcasecmp(partinfo->subtype, "octet-stream"))) {
+               const gchar *filename;
+
+               filename = procmime_mimeinfo_get_parameter(partinfo, "name");
+               if (filename != NULL)
+                       content_type = procmime_get_mime_type(filename);

        } else {
                content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
        }
        } else {
                content_type = g_strdup_printf("%s/%s", procmime_get_type_str(partinfo->type), partinfo->subtype);
        }