From: Christoph Hohmann <reboot@gmx.ch>
Date: Tue, 25 Mar 2003 23:35:47 +0000 (+0000)
Subject: 0.8.11claws48
X-Git-Tag: rel_0_9_0~168
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=739977116b9161486cc7f837b8a7c291012f1146;ds=sidebyside

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 eae6cb114..27b31a71c 100644
--- 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 c212378e8..b3964ccfa 100644
--- 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 7f475002c..7d7ddf619 100644
--- 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 e7945a744..24dd3a128 100644
--- 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");