jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed output of /hilight (add a space after -levels if any).

Browse Source 
Added recode to dcc-chat, patch by Jean-Yves Lefort

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@3708 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Valentin Batz 2005-02-11 17:27:09 +00:00 committed by vb
parent 19e800cf23
commit 5a8b583347
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fe-common/core/hilight-text.c
View File

@ -500,6 +500,8 @@ static void hilight_print(int index, HILIGHT_REC *rec)
g_strjoinv(",", rec->channels); g_strjoinv(",", rec->channels);
levelstr = rec->level == 0 ? NULL : levelstr = rec->level == 0 ? NULL :
bits2level(rec->level); bits2level(rec->level);
if (levelstr != NULL)
levelstr = g_strconcat(levelstr, " ", NULL);
printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP, printformat(NULL, NULL, MSGLEVEL_CLIENTCRAP,
TXT_HILIGHT_LINE, index, rec->text, TXT_HILIGHT_LINE, index, rec->text,
chans != NULL ? chans : "", chans != NULL ? chans : "",

25
src/irc/dcc/dcc-chat.c
View File

@ -21,6 +21,7 @@
#include "module.h" #include "module.h"
#include "signals.h" #include "signals.h"
#include "commands.h" #include "commands.h"
#include "recode.h"
#include "network.h" #include "network.h"
#include "net-nonblock.h" #include "net-nonblock.h"
#include "net-sendbuffer.h" #include "net-sendbuffer.h"
@ -147,18 +148,22 @@ void dcc_ctcp_message(IRC_SERVER_REC *server, const char *target,
CHAT_DCC_REC *chat, int notice, const char *msg) CHAT_DCC_REC *chat, int notice, const char *msg)
{ {
char *str; char *str;
char *recoded;
if (chat != NULL && chat->sendbuf != NULL) { if (chat != NULL && chat->sendbuf != NULL) {
/* send it via open DCC chat */ /* send it via open DCC chat */
recoded = recode_out(SERVER(server), msg, chat->nick);
str = g_strdup_printf("%s\001%s\001", chat->mirc_ctcp ? "" : str = g_strdup_printf("%s\001%s\001", chat->mirc_ctcp ? "" :
notice ? "CTCP_REPLY " : notice ? "CTCP_REPLY " :
"CTCP_MESSAGE ", msg); "CTCP_MESSAGE ", recoded);
dcc_chat_send(chat, str); dcc_chat_send(chat, str);
g_free(str); g_free(str);
} else { } else {
recoded = recode_out(SERVER(server), msg, target);
irc_send_cmdv(server, "%s %s :\001%s\001", irc_send_cmdv(server, "%s %s :\001%s\001",
notice ? "NOTICE" : "PRIVMSG", target, msg); notice ? "NOTICE" : "PRIVMSG", target, recoded);
} }
g_free(recoded);
} }
/* If `item' is a query of a =nick, return DCC chat record of nick */ /* If `item' is a query of a =nick, return DCC chat record of nick */
@ -196,8 +201,13 @@ static void cmd_msg(const char *data, SERVER_REC *server, WI_ITEM_REC *item)
else else
dcc = NULL; dcc = NULL;
if (dcc != NULL && dcc->sendbuf != NULL) if (dcc != NULL && dcc->sendbuf != NULL) {
dcc_chat_send(dcc, text); char *recoded;
recoded = recode_out(server, text, dcc->nick);
dcc_chat_send(dcc, recoded);
g_free(recoded);
}
if (dcc != NULL || *target == '=') if (dcc != NULL || *target == '=')
signal_stop(); signal_stop();
@ -305,8 +315,13 @@ void dcc_chat_input(CHAT_DCC_REC *dcc)
} }
if (ret > 0) { if (ret > 0) {
char *recoded;
dcc->transfd += ret; dcc->transfd += ret;
signal_emit("dcc chat message", 2, dcc, str);
recoded = recode_in(SERVER(dcc->server), str, dcc->nick);
signal_emit("dcc chat message", 2, dcc, recoded);
g_free(recoded);
} }
} while (ret > 0); } while (ret > 0);
} }