mirror of
https://github.com/weechat/weechat.git
synced 2026-07-05 17:23:15 +02:00
Fixed bug with server buffer when "look_one_server_buffer" is ON and server buffer is moved to any number > 1 (bug #19219)
This commit is contained in:
@@ -1,10 +1,12 @@
|
||||
WeeChat - Wee Enhanced Environment for Chat
|
||||
===========================================
|
||||
|
||||
ChangeLog - 2007-03-05
|
||||
ChangeLog - 2007-03-06
|
||||
|
||||
|
||||
Version 0.2.4 (under dev!):
|
||||
* fixed bug with server buffer when "look_one_server_buffer" is ON and
|
||||
server buffer is moved to any number > 1 (bug #19219)
|
||||
* fixed /help command: displays plugin help for redefined commands
|
||||
(bug #19166)
|
||||
* prefix '/' disabled in commands (patch #5769)
|
||||
|
||||
@@ -94,7 +94,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
|
||||
weechat_log_printf ("Creating new buffer\n");
|
||||
#endif
|
||||
|
||||
/* use first buffer if no server was assigned to this buffer */
|
||||
/* use first buffer if no server is assigned to this buffer */
|
||||
if ((type == BUFFER_TYPE_STANDARD) && gui_buffers
|
||||
&& (!SERVER(gui_buffers)) && (!channel))
|
||||
{
|
||||
@@ -111,19 +111,20 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
|
||||
gui_buffers->completion.server = server;
|
||||
return gui_buffers;
|
||||
}
|
||||
|
||||
|
||||
/* use "all servers" buffer if found */
|
||||
if (cfg_look_one_server_buffer && (type == BUFFER_TYPE_STANDARD) &&
|
||||
gui_buffers && server && !channel)
|
||||
{
|
||||
ptr_buffer = gui_buffer_servers_search ();
|
||||
if (ptr_buffer)
|
||||
{
|
||||
((t_irc_server *)(server))->buffer = gui_buffers;
|
||||
gui_buffers->server = server;
|
||||
((t_irc_server *)(server))->buffer = ptr_buffer;
|
||||
ptr_buffer->server = server;
|
||||
if (switch_to_buffer)
|
||||
gui_window_switch_to_buffer (window, gui_buffers);
|
||||
gui_window_redraw_buffer (gui_buffers);
|
||||
return gui_buffers;
|
||||
gui_window_switch_to_buffer (window, ptr_buffer);
|
||||
gui_window_redraw_buffer (ptr_buffer);
|
||||
return ptr_buffer;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+3
-1
@@ -1,10 +1,12 @@
|
||||
WeeChat - Wee Enhanced Environment for Chat
|
||||
===========================================
|
||||
|
||||
ChangeLog - 2007-03-05
|
||||
ChangeLog - 2007-03-06
|
||||
|
||||
|
||||
Version 0.2.4 (under dev!):
|
||||
* fixed bug with server buffer when "look_one_server_buffer" is ON and
|
||||
server buffer is moved to any number > 1 (bug #19219)
|
||||
* fixed /help command: displays plugin help for redefined commands
|
||||
(bug #19166)
|
||||
* prefix '/' disabled in commands (patch #5769)
|
||||
|
||||
@@ -94,7 +94,7 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
|
||||
weechat_log_printf ("Creating new buffer\n");
|
||||
#endif
|
||||
|
||||
/* use first buffer if no server was assigned to this buffer */
|
||||
/* use first buffer if no server is assigned to this buffer */
|
||||
if ((type == BUFFER_TYPE_STANDARD) && gui_buffers
|
||||
&& (!SERVER(gui_buffers)) && (!channel))
|
||||
{
|
||||
@@ -111,19 +111,20 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type,
|
||||
gui_buffers->completion.server = server;
|
||||
return gui_buffers;
|
||||
}
|
||||
|
||||
|
||||
/* use "all servers" buffer if found */
|
||||
if (cfg_look_one_server_buffer && (type == BUFFER_TYPE_STANDARD) &&
|
||||
gui_buffers && server && !channel)
|
||||
{
|
||||
ptr_buffer = gui_buffer_servers_search ();
|
||||
if (ptr_buffer)
|
||||
{
|
||||
((t_irc_server *)(server))->buffer = gui_buffers;
|
||||
gui_buffers->server = server;
|
||||
((t_irc_server *)(server))->buffer = ptr_buffer;
|
||||
ptr_buffer->server = server;
|
||||
if (switch_to_buffer)
|
||||
gui_window_switch_to_buffer (window, gui_buffers);
|
||||
gui_window_redraw_buffer (gui_buffers);
|
||||
return gui_buffers;
|
||||
gui_window_switch_to_buffer (window, ptr_buffer);
|
||||
gui_window_redraw_buffer (ptr_buffer);
|
||||
return ptr_buffer;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user