pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-02 07:46:38 +02:00
Code Activity

Fix clear of buffers with free content (allowed, but not from user with /buffer clear)

Browse Source
This commit is contained in:
Sebastien Helleu
2008-10-30 18:09:45 +01:00
parent 09524c17b0
commit 6f65f647f8
2 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/wee-command.c
+5 -2
View File
@@ -529,14 +529,17 @@ command_buffer (void *data, struct t_gui_buffer *buffer,
if (error && !error[0])
{
ptr_buffer = gui_buffer_search_by_number (number);
if (ptr_buffer)
if (ptr_buffer && (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATED))
gui_buffer_clear (ptr_buffer);
}
}
}
}
else
gui_buffer_clear (buffer);
{
if (buffer->type == GUI_BUFFER_TYPE_FORMATED)
gui_buffer_clear (buffer);
}
return WEECHAT_RC_OK;
}
src/gui/gui-buffer.c
+16 -18
View File
@@ -1137,27 +1137,24 @@ gui_buffer_clear (struct t_gui_buffer *buffer)
if (!buffer)
return;
if (buffer->type == GUI_BUFFER_TYPE_FORMATED)
/* remove buffer from hotlist */
gui_hotlist_remove_buffer (buffer);
/* remove all lines */
gui_chat_line_free_all (buffer);
/* remove any scroll for buffer */
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
{
/* remove buffer from hotlist */
gui_hotlist_remove_buffer (buffer);
/* remove all lines */
gui_chat_line_free_all (buffer);
/* remove any scroll for buffer */
for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window)
if (ptr_win->buffer == buffer)
{
if (ptr_win->buffer == buffer)
{
ptr_win->first_line_displayed = 1;
ptr_win->start_line = NULL;
ptr_win->start_line_pos = 0;
}
ptr_win->first_line_displayed = 1;
ptr_win->start_line = NULL;
ptr_win->start_line_pos = 0;
}
gui_buffer_ask_chat_refresh (buffer, 2);
}
gui_buffer_ask_chat_refresh (buffer, 2);
}
/*
@@ -1172,7 +1169,8 @@ gui_buffer_clear_all ()
for (ptr_buffer = gui_buffers; ptr_buffer;
ptr_buffer = ptr_buffer->next_buffer)
{
gui_buffer_clear (ptr_buffer);
if (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATED)
gui_buffer_clear (ptr_buffer);
}
}