blackbeard420/weechat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/426'

Browse Source
This commit is contained in:
Sébastien Helleu 2015-06-06 09:57:05 +02:00
commit dff39136a3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/xfer/xfer-chat.c
View File

@ -160,6 +160,12 @@ xfer_chat_recv_cb (void *arg_xfer, int fd)
{
ctcp_action = 0;
length = strlen (ptr_buf);
if (ptr_buf[length - 1] == '\r')
{
ptr_buf[length - 1] = '\0';
length--;
}
if ((ptr_buf[0] == '\01')
&& (ptr_buf[length - 1] == '\01'))
{
@ -268,7 +274,7 @@ xfer_chat_buffer_input_cb (void *data, struct t_gui_buffer *buffer,
{
if (!XFER_HAS_ENDED(ptr_xfer->status))
{
xfer_chat_sendf (ptr_xfer, "%s\n", input_data);
xfer_chat_sendf (ptr_xfer, "%s\r\n", input_data);
if (!XFER_HAS_ENDED(ptr_xfer->status))
{
str_color = xfer_chat_color_for_tags (weechat_config_color (weechat_config_get ("weechat.color.chat_nick_self")));

2
src/plugins/xfer/xfer-command.c
View File

@ -58,7 +58,7 @@ xfer_command_me (void *data, struct t_gui_buffer *buffer, int argc,
if (!XFER_HAS_ENDED(ptr_xfer->status))
{
xfer_chat_sendf (ptr_xfer, "\01ACTION %s\01\n",
xfer_chat_sendf (ptr_xfer, "\01ACTION %s\01\r\n",
(argv_eol[1]) ? argv_eol[1] : "");
weechat_printf_tags (buffer,
"no_highlight",