diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2006-04-18 13:30:29 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2006-04-18 13:30:29 +0000 |
| commit | 5af8e4f6e7bb6a8c60798dae694edc1ec765c575 (patch) | |
| tree | 014a3d44790daa531817dad1920888cdb95b8880 | |
| parent | a065de071c5200943607fc797267676224f00b75 (diff) | |
| download | weechat-5af8e4f6e7bb6a8c60798dae694edc1ec765c575.zip | |
Fixed bug in logs with nick for names lines (nicks on channel when joining new channel)
| -rw-r--r-- | src/irc/irc-display.c | 22 | ||||
| -rw-r--r-- | weechat/src/irc/irc-display.c | 22 |
2 files changed, 30 insertions, 14 deletions
diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index 7c8fac344..743cf8b87 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -250,13 +250,21 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname, } ptr_nickname[i] = '\0'; } - gui_printf_type_nick (buffer, type, - (nick) ? nick->nick : nickname, - "%s%s", - (force_color >= 0) ? - GUI_COLOR(force_color) : - GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), - ptr_nickname); + if (display_around) + gui_printf_type_nick (buffer, type, + (nick) ? nick->nick : nickname, + "%s%s", + (force_color >= 0) ? + GUI_COLOR(force_color) : + GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), + ptr_nickname); + else + gui_printf_type (buffer, type, + "%s%s", + (force_color >= 0) ? + GUI_COLOR(force_color) : + GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), + ptr_nickname); if (display_around && (spaces < 0)) gui_printf_type (buffer, type, "%s+", GUI_COLOR(COLOR_WIN_NICK_MORE)); diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index 7c8fac344..743cf8b87 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -250,13 +250,21 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname, } ptr_nickname[i] = '\0'; } - gui_printf_type_nick (buffer, type, - (nick) ? nick->nick : nickname, - "%s%s", - (force_color >= 0) ? - GUI_COLOR(force_color) : - GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), - ptr_nickname); + if (display_around) + gui_printf_type_nick (buffer, type, + (nick) ? nick->nick : nickname, + "%s%s", + (force_color >= 0) ? + GUI_COLOR(force_color) : + GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), + ptr_nickname); + else + gui_printf_type (buffer, type, + "%s%s", + (force_color >= 0) ? + GUI_COLOR(force_color) : + GUI_COLOR((nick) ? nick->color : COLOR_WIN_CHAT), + ptr_nickname); if (display_around && (spaces < 0)) gui_printf_type (buffer, type, "%s+", GUI_COLOR(COLOR_WIN_NICK_MORE)); |