pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-01 15:26:37 +02:00
Code Activity

core: revert check of layout when switching to a buffer using value "auto" in buffer_set

Browse Source 
This reverts commits 14cf7bd20f and
262dff4b87.

The initial fix was for a problem with irc autojoin and layout: the
current window has not appropriate buffer (as defined in layout) if it
is not the latest channel in "autojoin" option.

So the way to fix this problem is to set the value of option
irc.look.buffer_switch_autojoin to off.
This commit is contained in:
Sebastien Helleu
2013-11-28 19:59:36 +01:00
parent 02fc4053c9
commit 7e14c60f4d
5 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/gui-buffer.c
+6 -13
View File
@@ -1492,7 +1492,6 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
{
long number;
char *error;
int auto_switch;
if (!property || !value)
return;
@@ -1528,19 +1527,13 @@ gui_buffer_set (struct t_gui_buffer *buffer, const char *property,
else if (string_strcasecmp (property, "display") == 0)
{
/*
* on "automatic" switch:
* - check if the buffer displayed in window is the buffer in layout:
* if yes, do NOT switch to buffer
* - do NOT set the read marker
* if it is auto-switch to a buffer, then we don't set read marker,
* otherwise we reset it (if current buffer is not displayed) after
* switch
*/
auto_switch = (string_strcasecmp (value, "auto") == 0);
if (!auto_switch
|| (gui_layout_window_check_buffer (gui_current_window) != 1))
{
gui_window_switch_to_buffer (gui_current_window,
buffer,
(auto_switch) ? 0 : 1);
}
gui_window_switch_to_buffer (gui_current_window, buffer,
(string_strcasecmp (value, "auto") == 0) ?
0 : 1);
}
else if (string_strcasecmp (property, "print_hooks_enabled") == 0)
{