From 055d7de721d02f58ba80cfb945bb981947fc239d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sun, 25 Jan 2015 15:17:51 +0100 Subject: [PATCH] irc: shorten code to call irc_nick_new() in join callback --- src/plugins/irc/irc-protocol.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 84b1f6d83..625d34583 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -746,10 +746,8 @@ IRC_PROTOCOL_CALLBACK(join) } /* add nick in channel */ - if (pos_account) - ptr_nick = irc_nick_new (server, ptr_channel, nick, address, NULL, 0, pos_account); - else - ptr_nick = irc_nick_new (server, ptr_channel, nick, address, NULL, 0, "*"); + ptr_nick = irc_nick_new (server, ptr_channel, nick, address, NULL, 0, + (pos_account) ? pos_account : "*"); /* rename the nick if it was in list with a different case */ irc_channel_nick_speaking_rename_if_present (server, ptr_channel, nick);