summaryrefslogtreecommitdiff
path: root/src/plugins/irc/irc-nick.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/irc/irc-nick.c')
-rw-r--r--src/plugins/irc/irc-nick.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c
index e09b41d44..67390354b 100644
--- a/src/plugins/irc/irc-nick.c
+++ b/src/plugins/irc/irc-nick.c
@@ -81,16 +81,7 @@ irc_nick_is_nick (struct t_irc_server *server, const char *string)
utf8mapping = (server) ? server->utf8mapping : IRC_SERVER_UTF8MAPPING_NONE;
ptr_prefix_chars = (server && server->prefix_chars) ?
server->prefix_chars : irc_server_prefix_chars_default;
- if (server)
- {
- ptr_chantypes = (server->chantypes) ?
- server->chantypes :
- IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_DEFAULT_CHANTYPES);
- }
- else
- {
- ptr_chantypes = irc_channel_default_chantypes;
- }
+ ptr_chantypes = irc_server_get_chantypes (server);
/* check length of nick in bytes (if we have a limit in the server) */
if (server && (server->nick_max_length > 0)