0.8.11claws48

* src/mimeview.c
* src/procmime.c
        remove mime type guessing from mime parser and use
        name based mime types in viewer lookup for mime type
        application/octet-stream

diff --git a/ChangeLog.claws b/ChangeLog.claws
index eae6cb1142149ba26a31d53928159d5877a1beb0..27b31a71c34c2152a72a9f479e6fe7ecbcfeb440 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,12 @@
-2003-03-25 [christop]  0.8.11claws47
+2003-03-25 [christoph] 0.8.11claws48
+
+       * src/mimeview.c
+       * src/procmime.c
+               remove mime type guessing from mime parser and use
+               name based mime types in viewer lookup for mime type
+               application/octet-stream
+
+2003-03-25 [christoph] 0.8.11claws47
 
        * doc-src/readme.txt
        * doc-src/rfc2554.txt

diff --git a/configure.ac b/configure.ac
index c212378e87a166401c938c6fb4334cb3f21c5f86..b3964ccfa9c1b696ef71b534dc694dcd460de124 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws47
+EXTRA_VERSION=claws48
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/mimeview.c b/src/mimeview.c
index 7f475002cacd08f14d468b89a3d6c1f79a702328..7d7ddf6192a7f72c967118c490fe11908e7dd1f6 100644 (file)
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -508,11 +508,29 @@ static MimeViewer *get_viewer_for_content_type(MimeView *mimeview, const gchar *
        return viewer;
 }
 
+static MimeViewer *get_viewer_for_mimeinfo(MimeView *mimeview, MimeInfo *partinfo)
+{
+       gchar *content_type = NULL;
+       MimeViewer *viewer;
+
+       if ((partinfo->mime_type == MIME_APPLICATION_OCTET_STREAM) &&
+           (partinfo->name != NULL)) {
+               content_type = procmime_get_mime_type(partinfo->name);
+       } else {
+               content_type = g_strdup(partinfo->content_type);
+       }
+
+       viewer = get_viewer_for_content_type(mimeview, content_type);
+       g_free(content_type);
+
+       return viewer;
+}
+
 static gboolean mimeview_show_part(MimeView *mimeview, MimeInfo *partinfo)
 {
        MimeViewer *viewer;
        
-       viewer = get_viewer_for_content_type(mimeview, partinfo->content_type);
+       viewer = get_viewer_for_mimeinfo(mimeview, partinfo);
        if (viewer == NULL) {
                if (mimeview->mimeviewer != NULL)
                        mimeview->mimeviewer->clear_viewer(mimeview->mimeviewer);

diff --git a/src/procmime.c b/src/procmime.c
index e7945a744318b4ad8488e999055fb6b2847899e8..24dd3a12894002b17286fc6fd4e3850835776595 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -567,14 +567,6 @@ MimeInfo *procmime_scan_mime_header(FILE *fp)
                }
        }
 
-       if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM &&
-           mimeinfo->name) {
-               const gchar *type;
-               type = procmime_get_mime_type(mimeinfo->name);
-               if (type)
-                       mimeinfo->mime_type = procmime_scan_mime_type(type);
-       }
-
        if (!mimeinfo->content_type)
                        mimeinfo->content_type = g_strdup("text/plain");