From b41bd594b0324c4aa0d02ec35ad1efdcf2d4f6db Mon Sep 17 00:00:00 2001
From: TingPing <tingping@tingping.se>
Date: Sun, 6 Apr 2014 15:22:51 -0400
Subject: Add account to Join event

Also reorganizes some logic. The account will usually be NULL unless
extended-join capability enabled.

Closes #934
---
 src/common/proto-irc.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/common/proto-irc.c')

diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index 8f31d5c1..fa5446c4 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -1042,8 +1042,12 @@ process_named_msg (session *sess, char *type, char *word[], char *word_eol[],
 			{
 				char *chan = word[3];
 				char *account = word[4];
-				char *realname = word_eol[5] + 1;
+				char *realname = word_eol[5];
 
+				if (account && strcmp (account, "*") == 0)
+					account = NULL;
+				if (realname && *realname == ':')
+					realname++;
 				if (*chan == ':')
 					chan++;
 				if (!serv->p_cmp (nick, serv->nick))
-- 
cgit 1.4.1