diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2006-01-08 19:26:51 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2006-01-08 19:26:51 +0000 |
| commit | b3b1ab104b2364a6436430ee84739bbcb7ccfef5 (patch) | |
| tree | 213ec199cdf0fe4382a698d3d4c53eaf47dde359 /src/gui | |
| parent | 05992a34f3c7b0b252fe863ba1561963cdb02d22 (diff) | |
| download | weechat-b3b1ab104b2364a6436430ee84739bbcb7ccfef5.zip | |
Fixed hotlist display bug with server buffer when all servers are displayed on
same buffer (display was current server instead of server with activity)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/curses/gui-display.c | 5 | ||||
| -rw-r--r-- | src/gui/gui-common.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 782f401f6..4ed866a43 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -2164,7 +2164,10 @@ gui_draw_buffer_status (t_gui_buffer *buffer, int erase) else snprintf (format, sizeof (format) - 1, "%%.%ds", cfg_look_hotlist_names_length); if (BUFFER_IS_SERVER(ptr_hotlist->buffer)) - wprintw (ptr_win->win_status, format, SERVER(ptr_hotlist->buffer)->name); + wprintw (ptr_win->win_status, format, + (ptr_hotlist->server) ? + ptr_hotlist->server->name : + SERVER(ptr_hotlist->buffer)->name); else if (BUFFER_IS_CHANNEL(ptr_hotlist->buffer) || BUFFER_IS_PRIVATE(ptr_hotlist->buffer)) wprintw (ptr_win->win_status, format, CHANNEL(ptr_hotlist->buffer)->name); diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 88839d3c4..d2e53639e 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -844,13 +844,13 @@ gui_add_to_line (t_gui_buffer *buffer, int type, char *message) buffer->notify_level) { if (buffer->last_line->line_with_highlight) - hotlist_add (HOTLIST_HIGHLIGHT, buffer); + hotlist_add (HOTLIST_HIGHLIGHT, SERVER(buffer), buffer); else if (BUFFER_IS_PRIVATE(buffer) && (buffer->last_line->line_with_message)) - hotlist_add (HOTLIST_PRIVATE, buffer); + hotlist_add (HOTLIST_PRIVATE, SERVER(buffer), buffer); else if (buffer->last_line->line_with_message) - hotlist_add (HOTLIST_MSG, buffer); + hotlist_add (HOTLIST_MSG, SERVER(buffer), buffer); else - hotlist_add (HOTLIST_LOW, buffer); + hotlist_add (HOTLIST_LOW, SERVER(buffer), buffer); gui_draw_buffer_status (gui_current_window->buffer, 1); } } |