diff --git a/src/common/weeconfig.c b/src/common/weeconfig.c index 4a771de71..380957f1a 100644 --- a/src/common/weeconfig.c +++ b/src/common/weeconfig.c @@ -74,7 +74,6 @@ char *cfg_look_charset_encode; char *cfg_look_charset_internal; int cfg_look_one_server_buffer; char *cfg_look_buffer_timestamp; -int cfg_look_color_nicks; int cfg_look_color_nicks_number; int cfg_look_color_actions; int cfg_look_nicklist; @@ -142,10 +141,6 @@ t_config_option weechat_options_look[] = N_("timestamp for buffers"), OPTION_TYPE_STRING, 0, 0, 0, "[%H:%M:%S]", NULL, NULL, &cfg_look_buffer_timestamp, config_change_buffer_content }, - { "look_color_nicks", N_("display nick names with different colors"), - N_("display nick names with different colors"), - OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, - NULL, NULL, &cfg_look_color_nicks, NULL, config_change_noop }, { "look_color_nicks_number", N_("number of colors to use for nicks colors"), N_("number of colors to use for nicks colors"), OPTION_TYPE_INT, 1, 10, 10, diff --git a/src/common/weeconfig.h b/src/common/weeconfig.h index 6d17bb9ab..38096af2f 100644 --- a/src/common/weeconfig.h +++ b/src/common/weeconfig.h @@ -89,7 +89,6 @@ extern char *cfg_look_charset_encode; extern char *cfg_look_charset_internal; extern int cfg_look_one_server_buffer; extern char *cfg_look_buffer_timestamp; -extern int cfg_look_color_nicks; extern int cfg_look_color_nicks_number; extern int cfg_look_color_actions; extern int cfg_look_nicklist; diff --git a/src/irc/irc-display.c b/src/irc/irc-display.c index da1e9aae8..97272c09d 100644 --- a/src/irc/irc-display.c +++ b/src/irc/irc-display.c @@ -124,9 +124,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname, else gui_printf_type (buffer, type, "%s%s", GUI_COLOR((nick && color_nick) ? - ((cfg_look_color_nicks) ? - nick->color : COLOR_WIN_CHAT) : - COLOR_WIN_CHAT), + nick->color : COLOR_WIN_CHAT), (nick) ? nick->nick : nickname); if (display_around) diff --git a/weechat/src/common/weeconfig.c b/weechat/src/common/weeconfig.c index 4a771de71..380957f1a 100644 --- a/weechat/src/common/weeconfig.c +++ b/weechat/src/common/weeconfig.c @@ -74,7 +74,6 @@ char *cfg_look_charset_encode; char *cfg_look_charset_internal; int cfg_look_one_server_buffer; char *cfg_look_buffer_timestamp; -int cfg_look_color_nicks; int cfg_look_color_nicks_number; int cfg_look_color_actions; int cfg_look_nicklist; @@ -142,10 +141,6 @@ t_config_option weechat_options_look[] = N_("timestamp for buffers"), OPTION_TYPE_STRING, 0, 0, 0, "[%H:%M:%S]", NULL, NULL, &cfg_look_buffer_timestamp, config_change_buffer_content }, - { "look_color_nicks", N_("display nick names with different colors"), - N_("display nick names with different colors"), - OPTION_TYPE_BOOLEAN, BOOL_FALSE, BOOL_TRUE, BOOL_TRUE, - NULL, NULL, &cfg_look_color_nicks, NULL, config_change_noop }, { "look_color_nicks_number", N_("number of colors to use for nicks colors"), N_("number of colors to use for nicks colors"), OPTION_TYPE_INT, 1, 10, 10, diff --git a/weechat/src/common/weeconfig.h b/weechat/src/common/weeconfig.h index 6d17bb9ab..38096af2f 100644 --- a/weechat/src/common/weeconfig.h +++ b/weechat/src/common/weeconfig.h @@ -89,7 +89,6 @@ extern char *cfg_look_charset_encode; extern char *cfg_look_charset_internal; extern int cfg_look_one_server_buffer; extern char *cfg_look_buffer_timestamp; -extern int cfg_look_color_nicks; extern int cfg_look_color_nicks_number; extern int cfg_look_color_actions; extern int cfg_look_nicklist; diff --git a/weechat/src/irc/irc-display.c b/weechat/src/irc/irc-display.c index da1e9aae8..97272c09d 100644 --- a/weechat/src/irc/irc-display.c +++ b/weechat/src/irc/irc-display.c @@ -124,9 +124,7 @@ irc_display_nick (t_gui_buffer *buffer, t_irc_nick *nick, char *nickname, else gui_printf_type (buffer, type, "%s%s", GUI_COLOR((nick && color_nick) ? - ((cfg_look_color_nicks) ? - nick->color : COLOR_WIN_CHAT) : - COLOR_WIN_CHAT), + nick->color : COLOR_WIN_CHAT), (nick) ? nick->nick : nickname); if (display_around)