diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2011-11-05 12:53:29 +0100 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2011-11-05 12:53:29 +0100 |
| commit | f211a839f6e55769288ee82051b00618dc719e99 (patch) | |
| tree | 5bc431684759a14155f53df225dcf76b16e8ad33 /src/gui/gui-line.c | |
| parent | 8e5288ba27db92f4aa21a8ade5af57fd1d9dbe7f (diff) | |
| download | weechat-f211a839f6e55769288ee82051b00618dc719e99.zip | |
core: rename options weechat.history.{max_lines|max_minutes} to weechat.history.{max_buffer_lines_number|max_buffer_lines_minutes}
Diffstat (limited to 'src/gui/gui-line.c')
| -rw-r--r-- | src/gui/gui-line.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c index 00f5c2699..26d0baac7 100644 --- a/src/gui/gui-line.c +++ b/src/gui/gui-line.c @@ -806,11 +806,12 @@ gui_line_add (struct t_gui_buffer *buffer, time_t date, lines_removed = 0; current_time = time (NULL); while (buffer->own_lines->first_line - && (((CONFIG_INTEGER(config_history_max_lines) > 0) - && (buffer->own_lines->lines_count + 1 > CONFIG_INTEGER(config_history_max_lines))) - || ((CONFIG_INTEGER(config_history_max_minutes) > 0) + && (((CONFIG_INTEGER(config_history_max_buffer_lines_number) > 0) + && (buffer->own_lines->lines_count + 1 > + CONFIG_INTEGER(config_history_max_buffer_lines_number))) + || ((CONFIG_INTEGER(config_history_max_buffer_lines_minutes) > 0) && (current_time - buffer->own_lines->first_line->data->date_printed > - CONFIG_INTEGER(config_history_max_minutes) * 60)))) + CONFIG_INTEGER(config_history_max_buffer_lines_minutes) * 60)))) { gui_line_free (buffer, buffer->own_lines->first_line); lines_removed++; |