From e2c282962d73d21414e6358aec97dc308199c3c8 Mon Sep 17 00:00:00 2001
From: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>
Date: Tue, 1 Nov 2005 08:08:05 +0000
Subject: added fallback encoding setting.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@702 ee746299-78ed-0310-b773-934348b2243d
---
 libsylph/procmime.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libsylph/procmime.c')

diff --git a/libsylph/procmime.c b/libsylph/procmime.c
index e9e53d6f..314a4eac 100644
--- a/libsylph/procmime.c
+++ b/libsylph/procmime.c
@@ -781,8 +781,9 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo, FILE *infp,
 		return NULL;
 	}
 
-	src_encoding = prefs_common.force_charset
-		? prefs_common.force_charset : mimeinfo->charset;
+	src_encoding = prefs_common.force_charset ? prefs_common.force_charset
+		: mimeinfo->charset ? mimeinfo->charset
+		: prefs_common.fallback_encoding;
 
 	if (mimeinfo->mime_type == MIME_TEXT) {
 		while (fgets(buf, sizeof(buf), tmpfp) != NULL) {
-- 
cgit v1.2.3