Message fromname and toname through chartran

This commit is contained in:
Michiel Broek 2007-02-26 21:43:25 +00:00
parent c1fc77eaed
commit 166c5cc25b

View File

@ -964,7 +964,7 @@ void ShowMsgHdr(void)
else else
color = GREEN; color = GREEN;
colour(color++, BLACK); colour(color++, BLACK);
PUTSTR(Msg.From); PUTSTR(chartran(Msg.From));
if (iMsgAreaType != LOCALMAIL) { if (iMsgAreaType != LOCALMAIL) {
snprintf(msg, 81, " (%s)", Msg.FromAddress); snprintf(msg, 81, " (%s)", Msg.FromAddress);
pout(color, BLACK, msg); pout(color, BLACK, msg);
@ -978,7 +978,7 @@ void ShowMsgHdr(void)
else else
color = GREEN; color = GREEN;
colour(color++, BLACK); colour(color++, BLACK);
PUTSTR(Msg.To); PUTSTR(chartran(Msg.To));
if (iMsgAreaType == NETMAIL) { if (iMsgAreaType == NETMAIL) {
snprintf(msg, 81, " (%s)", Msg.ToAddress); snprintf(msg, 81, " (%s)", Msg.ToAddress);
pout(color, BLACK, msg); pout(color, BLACK, msg);
@ -1247,9 +1247,6 @@ int Read_a_Msg(unsigned int Num, int UpdateLR)
} }
free(fn); free(fn);
if (charset == NULL)
Syslog('b', "charset is still NULL");
if ((charset == NULL) && (msgs.Charset != FTNC_NONE)) { if ((charset == NULL) && (msgs.Charset != FTNC_NONE)) {
/* /*
* No charset marked in the message, use the area charset * No charset marked in the message, use the area charset
@ -1259,7 +1256,6 @@ int Read_a_Msg(unsigned int Num, int UpdateLR)
charsin = xstrcpy(get_ic_ftn(find_ftn_charset(charset))); charsin = xstrcpy(get_ic_ftn(find_ftn_charset(charset)));
} }
Syslog('b', "charsets: %s -> %s", charsin, get_ic_ftn(exitinfo.Charset));
/* /*
* Try to setup charset mapping if the charactersets are different. * Try to setup charset mapping if the charactersets are different.
*/ */