From 33dd793143e30b0cfa7da4b9b9524fc8d1e17268 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 20 Apr 2008 23:35:26 +0200 Subject: [PATCH] Fixed broken completion on buffers where nicklist is not displayed (bug #23006) --- src/gui/gui-completion.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c index eed13390a..5abcb5b0c 100644 --- a/src/gui/gui-completion.c +++ b/src/gui/gui-completion.c @@ -499,23 +499,20 @@ gui_completion_list_add_nicks (struct t_gui_completion *completion) { /* no plugin overrides nick completion, then we use default nick */ /* completion, wich nicks of nicklist, in order of nicklist */ - if (completion->buffer->nicklist) + ptr_group = NULL; + ptr_nick = NULL; + gui_nicklist_get_next_item (completion->buffer, + &ptr_group, &ptr_nick); + while (ptr_group || ptr_nick) { - ptr_group = NULL; - ptr_nick = NULL; + if (ptr_nick && ptr_nick->visible) + { + gui_completion_list_add (completion, + ptr_nick->name, + 1, WEECHAT_LIST_POS_END); + } gui_nicklist_get_next_item (completion->buffer, &ptr_group, &ptr_nick); - while (ptr_group || ptr_nick) - { - if (ptr_nick && ptr_nick->visible) - { - gui_completion_list_add (completion, - ptr_nick->name, - 1, WEECHAT_LIST_POS_END); - } - gui_nicklist_get_next_item (completion->buffer, - &ptr_group, &ptr_nick); - } } } @@ -1375,7 +1372,7 @@ gui_completion_auto (struct t_gui_completion *completion) } /* default: nick completion (if there's a nicklist) */ - if (completion->buffer->nicklist) + if (completion->buffer->nicklist_root) gui_completion_nick (completion); else completion->context = GUI_COMPLETION_NULL;