diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-07 06:39:56 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-07 06:39:56 +0000 |
| commit | fbf788d083531c1f2677eb22041e578c7280fe3a (patch) | |
| tree | b518f6afc508a218e25be06e5c3af61ecc05d166 /libsylph | |
| parent | 9b171679a3b03c25183b40ada5fcee8bb83ed393 (diff) | |
moved the location of fallback_encoding.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@716 ee746299-78ed-0310-b773-934348b2243d
Diffstat (limited to 'libsylph')
| -rw-r--r-- | libsylph/prefs_common.c | 5 | ||||
| -rw-r--r-- | libsylph/prefs_common.h | 2 | ||||
| -rw-r--r-- | libsylph/procmime.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libsylph/prefs_common.c b/libsylph/prefs_common.c index c8a4f1c8..1c90fd7e 100644 --- a/libsylph/prefs_common.c +++ b/libsylph/prefs_common.c @@ -62,7 +62,7 @@ static PrefParam param[] = { {"save_message", "TRUE", &prefs_common.savemsg, P_BOOL}, {"filter_sent_message", "FALSE", &prefs_common.filter_sent, P_BOOL}, - {"outgoing_charset", CS_AUTO, &prefs_common.outgoing_charset, P_STRING}, + {"outgoing_charset", NULL, &prefs_common.outgoing_charset, P_STRING}, {"encoding_method", "0", &prefs_common.encoding_method, P_ENUM}, {"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana, @@ -244,8 +244,7 @@ static PrefParam param[] = { {"resize_image", "TRUE", &prefs_common.resize_image, P_BOOL}, {"inline_image", "TRUE", &prefs_common.inline_image, P_BOOL}, - {"fallback_encoding", CS_AUTO, &prefs_common.fallback_encoding, - P_STRING}, + {"default_encoding", NULL, &prefs_common.default_encoding, P_STRING}, {"show_other_header", "FALSE", &prefs_common.show_other_header, P_BOOL}, diff --git a/libsylph/prefs_common.h b/libsylph/prefs_common.h index f3c3ce9d..c6b85b1f 100644 --- a/libsylph/prefs_common.h +++ b/libsylph/prefs_common.h @@ -173,7 +173,7 @@ struct _PrefsCommon gboolean inline_image; gchar *force_charset; - gchar *fallback_encoding; + gchar *default_encoding; gboolean show_other_header; GSList *disphdr_list; diff --git a/libsylph/procmime.c b/libsylph/procmime.c index 314a4eac..da7e8b1f 100644 --- a/libsylph/procmime.c +++ b/libsylph/procmime.c @@ -783,7 +783,7 @@ FILE *procmime_get_text_content(MimeInfo *mimeinfo, FILE *infp, src_encoding = prefs_common.force_charset ? prefs_common.force_charset : mimeinfo->charset ? mimeinfo->charset - : prefs_common.fallback_encoding; + : prefs_common.default_encoding; if (mimeinfo->mime_type == MIME_TEXT) { while (fgets(buf, sizeof(buf), tmpfp) != NULL) { |