pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-05 01:03:14 +02:00
Code Activity

irc: do not use option irc.look.nick_color_stop_chars for forced nick colors (bug #33480)

Browse Source
This commit is contained in:
Sebastien Helleu
2011-12-27 18:20:52 +01:00
parent a35364524a
commit 5ee0e798b1
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -1,7 +1,7 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.7-dev, 2011-12-25
v0.3.7-dev, 2011-12-27
Version 0.3.7 (under dev!)
@@ -42,6 +42,8 @@ Version 0.3.7 (under dev!)
* api: add new functions strcasecmp_range, strncasecmp_range,
hashtable_map_string, hdata_check_pointer, hdata_char, hdata_hashtable and
nicklist_get_next_item
* irc: do not use option irc.look.nick_color_stop_chars for forced nick colors
(bug #33480)
* irc: add optional server in info "irc_is_channel" (before channel name)
(bug #35124), add optional server in info_hashtable "irc_message_parse"
* irc: reset read marker of current buffer on manual /join
src/plugins/irc/irc-nick.c
+4 -14
View File
@@ -177,23 +177,18 @@ irc_nick_find_color (const char *nickname)
if (irc_config_num_nick_colors == 0)
return weechat_color ("default");
nickname2 = irc_nick_strdup_for_color (nickname);
/* look if color is forced */
forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force,
(nickname2) ? nickname2 : nickname);
nickname);
if (forced_color)
{
forced_color = weechat_color (forced_color);
if (forced_color && forced_color[0])
{
if (nickname2)
free (nickname2);
return forced_color;
}
}
/* hash nickname to get color */
nickname2 = irc_nick_strdup_for_color (nickname);
color = irc_nick_hash_color ((nickname2) ? nickname2 : nickname);
if (nickname2)
free (nickname2);
@@ -222,19 +217,14 @@ irc_nick_find_color_name (const char *nickname)
if (irc_config_num_nick_colors == 0)
return default_color;
nickname2 = irc_nick_strdup_for_color (nickname);
/* look if color is forced */
forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force,
(nickname2) ? nickname2 : nickname);
nickname);
if (forced_color)
{
if (nickname2)
free (nickname2);
return forced_color;
}
/* hash nickname to get color */
nickname2 = irc_nick_strdup_for_color (nickname);
color = irc_nick_hash_color ((nickname2) ? nickname2 : nickname);
if (nickname2)
free (nickname2);