aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/procmime.c8
3 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 39f597d1..369e959f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-07-14
+ * src/procmime.c: procmime_decode_content(): don't uncanonicalize
+ files whose name is *.txt but the Content-Type is
+ application/octet-stream.
+
+2005-07-14
+
* src/filter.c
src/folderview.c: modify filter rules after moving folders.
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 495ccc00..e9cd8a6e 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,5 +1,11 @@
2005-07-14
+ * src/procmime.c: procmime_decode_content(): 名前が *.txt だが
+ Content-Type が application/octet-stream であるようなファイルを
+ 正規化解除しないようにした。
+
+2005-07-14
+
* src/filter.c
src/folderview.c: フォルダの移動後にフィルタルールを修正するように
した。
diff --git a/src/procmime.c b/src/procmime.c
index bc16e3b4..5f067e68 100644
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -587,10 +587,12 @@ FILE *procmime_decode_content(FILE *outfp, FILE *infp, MimeInfo *mimeinfo)
Base64Decoder *decoder;
gboolean uncanonicalize = FALSE;
FILE *tmpfp = outfp;
+ ContentType content_type;
- if (mimeinfo->mime_type == MIME_TEXT ||
- mimeinfo->mime_type == MIME_TEXT_HTML ||
- mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+ content_type = procmime_scan_mime_type(mimeinfo->content_type);
+ if (content_type == MIME_TEXT ||
+ content_type == MIME_TEXT_HTML ||
+ content_type == MIME_MESSAGE_RFC822) {
uncanonicalize = TRUE;
tmpfp = my_tmpfile();
if (!tmpfp) {