diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | src/irc/irc-recv.c | 12 | ||||
| -rw-r--r-- | weechat/ChangeLog | 3 | ||||
| -rw-r--r-- | weechat/src/irc/irc-recv.c | 12 |
4 files changed, 24 insertions, 6 deletions
@@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-03-21 +ChangeLog - 2007-03-22 Version 0.2.4 (under dev!): + * fixed bug with channel topic after reconnection (not erased) (bug #19384) * added current buffer in hotlist when scrolling up in buffer (task #6664) * fixed bug with explode_string / free_exploded_string when max_items > 0 * added new key (ctrl-R) for interactive and incremental search in buffer diff --git a/src/irc/irc-recv.c b/src/irc/irc-recv.c index 3b1057d43..51657147c 100644 --- a/src/irc/irc-recv.c +++ b/src/irc/irc-recv.c @@ -491,10 +491,18 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments arguments); } - /* display channel creation date if joining new channel */ + /* remove topic and display channel creation date if joining new channel */ if (!ptr_channel->nicks) + { + if (ptr_channel->topic) + { + free (ptr_channel->topic); + ptr_channel->topic = NULL; + gui_chat_draw_title (ptr_channel->buffer, 1); + } ptr_channel->display_creation_date = 1; - + } + /* add nick in channel */ ptr_nick = nick_new (server, ptr_channel, nick, 0, 0, 0, 0, 0); if (ptr_nick) diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 45a8ea283..f855a62e0 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,11 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2007-03-21 +ChangeLog - 2007-03-22 Version 0.2.4 (under dev!): + * fixed bug with channel topic after reconnection (not erased) (bug #19384) * added current buffer in hotlist when scrolling up in buffer (task #6664) * fixed bug with explode_string / free_exploded_string when max_items > 0 * added new key (ctrl-R) for interactive and incremental search in buffer diff --git a/weechat/src/irc/irc-recv.c b/weechat/src/irc/irc-recv.c index 3b1057d43..51657147c 100644 --- a/weechat/src/irc/irc-recv.c +++ b/weechat/src/irc/irc-recv.c @@ -491,10 +491,18 @@ irc_cmd_recv_join (t_irc_server *server, char *host, char *nick, char *arguments arguments); } - /* display channel creation date if joining new channel */ + /* remove topic and display channel creation date if joining new channel */ if (!ptr_channel->nicks) + { + if (ptr_channel->topic) + { + free (ptr_channel->topic); + ptr_channel->topic = NULL; + gui_chat_draw_title (ptr_channel->buffer, 1); + } ptr_channel->display_creation_date = 1; - + } + /* add nick in channel */ ptr_nick = nick_new (server, ptr_channel, nick, 0, 0, 0, 0, 0); if (ptr_nick) |