const char *p = charsets;
while (*p) {
- char cset[SHORT_STRING];
+ char cset[STRING];
const char *q;
char *s;
ssize_t slen, n;
ssize_t elen;
const char *charsets;
- if (!Charset || !*pd)
+ if (!MCharset.charset || !*pd)
return;
- charsets = m_strisempty(SendCharset) ? "UTF-8" : SendCharset;
+ charsets = m_strisempty(MCharset.send_charset) ? "utf-8" : MCharset.send_charset;
rfc2047_encode(*pd, m_strlen(*pd), col,
- Charset, charsets, &e, &elen,
+ MCharset.charset, charsets, &e, &elen,
encode_specials ? RFC822Specials : NULL);
p_delete(pd);
*q = '\0';
if (*charset)
- mutt_convert_string(&d0, charset, Charset, M_ICONV_HOOK_FROM);
+ mutt_convert_string(&d0, charset, MCharset.charset, M_ICONV_HOOK_FROM);
m_strcpy(d, len, d0);
p_delete(&d0);
return 0;
n -= m, s += m;
}
- if (mime_which_token(AssumedCharset, -1) == MIME_US_ASCII) {
+ if (mime_which_token(MCharset.assumed_charset, -1) == MIME_US_ASCII) {
char *t;
t = p_dupstr(s, n);