From 37e4e1f01168617f2eb249f4b9a847ad434cc7ea Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 1 Jan 2007 17:42:12 +0000 Subject: [PATCH] Fixed bug with use of first buffer for a channel if not connected to server (now allowed only for a server buffer) --- ChangeLog | 4 +++- src/gui/gui-buffer.c | 3 ++- weechat/ChangeLog | 4 +++- weechat/src/gui/gui-buffer.c | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0b728027f..12e9ba9f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-12-26 +ChangeLog - 2007-01-01 Version 0.2.2 (under dev!): + * fixed bug with use of first buffer for a channel if not connected + to server (now allowed only for a server buffer) * fixed refresh bug with private buffer title * fixed bug with nick completion in command args (now uses option look_nick_completion_ignore) diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 2d2503847..bf7b3f6cb 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -88,7 +88,8 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type, #endif /* use first buffer if no server was assigned to this buffer */ - if ((type == BUFFER_TYPE_STANDARD) && gui_buffers && (!SERVER(gui_buffers))) + if ((type == BUFFER_TYPE_STANDARD) && gui_buffers + && (!SERVER(gui_buffers)) && (!channel)) { if (server) ((t_irc_server *)(server))->buffer = gui_buffers; diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 0b728027f..12e9ba9f5 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -1,10 +1,12 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -ChangeLog - 2006-12-26 +ChangeLog - 2007-01-01 Version 0.2.2 (under dev!): + * fixed bug with use of first buffer for a channel if not connected + to server (now allowed only for a server buffer) * fixed refresh bug with private buffer title * fixed bug with nick completion in command args (now uses option look_nick_completion_ignore) diff --git a/weechat/src/gui/gui-buffer.c b/weechat/src/gui/gui-buffer.c index 2d2503847..bf7b3f6cb 100644 --- a/weechat/src/gui/gui-buffer.c +++ b/weechat/src/gui/gui-buffer.c @@ -88,7 +88,8 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type, #endif /* use first buffer if no server was assigned to this buffer */ - if ((type == BUFFER_TYPE_STANDARD) && gui_buffers && (!SERVER(gui_buffers))) + if ((type == BUFFER_TYPE_STANDARD) && gui_buffers + && (!SERVER(gui_buffers)) && (!channel)) { if (server) ((t_irc_server *)(server))->buffer = gui_buffers;