fixed recoding of own messages.

recode after expand_emphasis
remove the redundant call to setlocale(LC_CTYPE, )


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@4038 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Valentin Batz 2005-10-12 18:22:14 +00:00 committed by vb
commit d8d47ef37f
3 changed files with 16 additions and 14 deletions

View file

@ -259,8 +259,6 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
const char *nickmode;
char *freemsg = NULL, *recoded;
int print_channel;
/* ugly: recode the sent message back for printing */
recoded = recode_in(server, msg, target);
channel = channel_find(server, target);
if (channel != NULL)
target = channel->visible_name;
@ -280,6 +278,9 @@ static void sig_message_own_public(SERVER_REC *server, const char *msg,
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) channel, msg);
/* ugly: recode the sent message back for printing */
recoded = recode_in(server, msg, target);
if (!print_channel) {
printformat(server, target, MSGLEVEL_PUBLIC | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
TXT_OWN_MSG, server->nick, recoded, nickmode);
@ -316,15 +317,16 @@ static void sig_message_own_private(SERVER_REC *server, const char *msg,
query = privmsg_get_query(server, target, TRUE, MSGLEVEL_MSGS);
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, msg);
/* ugly: recode the sent message back for printing */
recoded = recode_in(server, msg, target);
if (settings_get_bool("emphasis"))
msg = freemsg = expand_emphasis((WI_ITEM_REC *) query, recoded);
printformat(server, target,
MSGLEVEL_MSGS | MSGLEVEL_NOHILIGHT | MSGLEVEL_NO_ACT,
query == NULL ? TXT_OWN_MSG_PRIVATE :
TXT_OWN_MSG_PRIVATE_QUERY, target, msg, server->nick);
TXT_OWN_MSG_PRIVATE_QUERY, target, recoded, server->nick);
g_free(recoded);
g_free_not_null(freemsg);