diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2013-05-21 11:07:15 +0200 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2013-05-21 11:07:15 +0200 |
| commit | 2e43bac479d1fba40ba3e3a1e0cc22bcdc9abee7 (patch) | |
| tree | c41ef9019bcd18e1945864420a8eac86e7c95bf5 | |
| parent | a256cb4d4d30d2f496f9800ad915f72679286caf (diff) | |
| download | weechat-2e43bac479d1fba40ba3e3a1e0cc22bcdc9abee7.zip | |
core: fix line alignment when option weechat.look.buffer_time_format is set to empty string
A regression was introduced by commit 305175fb8c464a169e767a814f5c400154507e6f
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-chat.c | 3 | ||||
| -rw-r--r-- | src/gui/gui-line.c | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.4.2-dev, 2013-05-20 +v0.4.2-dev, 2013-05-21 This document lists all changes for each version. @@ -11,6 +11,12 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] (file 'NEWS' in sources). +Version 0.4.2 (under dev!) +-------------------------- + +* core: fix line alignment when option weechat.look.buffer_time_format is set + to empty string + Version 0.4.1 (2013-05-20) -------------------------- diff --git a/src/gui/curses/gui-curses-chat.c b/src/gui/curses/gui-curses-chat.c index b75b5e3e1..19570437e 100644 --- a/src/gui/curses/gui-curses-chat.c +++ b/src/gui/curses/gui-curses-chat.c @@ -479,8 +479,7 @@ gui_chat_display_word (struct t_gui_window *window, && (CONFIG_INTEGER(config_look_prefix_align) != CONFIG_LOOK_PREFIX_ALIGN_NONE) && CONFIG_STRING(config_look_prefix_suffix) && CONFIG_STRING(config_look_prefix_suffix)[0] - && line->data->str_time - && line->data->str_time[0]) + && line->data->date > 0) { if (!simulate) { diff --git a/src/gui/gui-line.c b/src/gui/gui-line.c index 51ed5288d..c4c4cbef2 100644 --- a/src/gui/gui-line.c +++ b/src/gui/gui-line.c @@ -210,7 +210,7 @@ gui_line_get_align (struct t_gui_buffer *buffer, struct t_gui_line *line, int length_time, length_buffer, length_suffix, prefix_length, prefix_is_nick; /* return immediately if line has no time (not aligned) */ - if (!line->data->str_time || !line->data->str_time[0]) + if (line->data->date == 0) return 0; /* return immediately if alignment for end of lines is "time" */ |