aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2008-06-18 09:24:05 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2008-06-18 09:24:05 +0000
commitc33aef05f2459480863b8b36ac813b3a8b3ad42c (patch)
tree230d7a6ea2bb4d96d794c9edd6f69045b3418035
parent003e3b2da83a1ac1a43fe2031446c23c900a06a7 (diff)
also use MimeInfo::filename to determine file type.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2018 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja5
-rw-r--r--libsylph/procmime.c6
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index acc29167..2616f4e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-18
+
+ * libsylph/procmime.c: procmime_scan_mime_header(): also use
+ MimeInfo::filename to determine file type.
+
2008-06-17
* version 2.5.0
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 690374c8..17a8426d 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2008-06-18
+
+ * libsylph/procmime.c: procmime_scan_mime_header(): ファイルタイプ
+ を決定するのに MimeInfo::filename も使用するようにした。
+
2008-06-17
* version 2.5.0
diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index 684256cd..a4de784d 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -782,9 +782,11 @@ MimeInfo *procmime_scan_mime_header(FILE *fp)
}
if (mimeinfo->mime_type == MIME_APPLICATION_OCTET_STREAM &&
- mimeinfo->name) {
+ (mimeinfo->filename || mimeinfo->name)) {
const gchar *type;
- type = procmime_get_mime_type(mimeinfo->name);
+ type = procmime_get_mime_type
+ (mimeinfo->filename ? mimeinfo->filename
+ : mimeinfo->name);
if (type)
mimeinfo->mime_type = procmime_scan_mime_type(type);
}