From 8b17cbb16c9d7540b6d89d96bc642a5baec88c0e Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 6 May 2013 15:07:24 +0200 Subject: [PATCH] irc: fix display of CTCP messages that contain bold attribute (bug #38895) --- ChangeLog | 3 ++- src/plugins/irc/irc-ctcp.c | 2 +- src/plugins/irc/irc-input.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26e061cc3..5becf9deb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.4.1-rc1, 2013-05-03 +v0.4.1-rc1, 2013-05-06 This document lists all changes for each version. @@ -58,6 +58,7 @@ Version 0.4.1 (under dev!) list with arguments inside), guile >= 2.0 is now required (bug #38350) * guile: fix crash on calls to callbacks during load of script (bug #38343) * guile: fix compilation with guile 2.0 +* irc: fix display of CTCP messages that contain bold attribute (bug #38895) * irc: add support of "dh-aes" SASL mechanism (patch #8020) * irc: fix duplicate nick completion when someone rejoins the channel with same nick but a different case (bug #38841) diff --git a/src/plugins/irc/irc-ctcp.c b/src/plugins/irc/irc-ctcp.c index b21a4328e..07eddf7cd 100644 --- a/src/plugins/irc/irc-ctcp.c +++ b/src/plugins/irc/irc-ctcp.c @@ -155,7 +155,7 @@ irc_ctcp_display_reply_from_nick (struct t_irc_server *server, time_t date, while (arguments && arguments[0]) { - pos_end = strchr (arguments + 1, '\01'); + pos_end = strrchr (arguments + 1, '\01'); if (pos_end) pos_end[0] = '\0'; diff --git a/src/plugins/irc/irc-input.c b/src/plugins/irc/irc-input.c index ddd13cc00..881819caf 100644 --- a/src/plugins/irc/irc-input.c +++ b/src/plugins/irc/irc-input.c @@ -55,7 +55,7 @@ irc_input_user_message_display (struct t_gui_buffer *buffer, int action, if (strncmp (text, "\01ACTION ", 8) == 0) { action = 1; - pos = strchr (text + 8, '\01'); + pos = strrchr (text + 8, '\01'); if (pos) text2 = weechat_strndup (text + 8, pos - text - 8); else