Add prefixes to irc_nicklist_insert() so that nickrec.prefixes is accurate in the

"nicklist new" signal.

Fixes the nicklist sorting on xirssi.

Patch by nenolod.


git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5184 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Wouter Coekaerts 2010-07-24 14:36:55 +00:00 committed by coekie
commit 350b346c84
5 changed files with 13 additions and 11 deletions

View file

@ -31,7 +31,8 @@
/* Add new nick to list */
NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
int op, int halfop, int voice, int send_massjoin)
int op, int halfop, int voice, int send_massjoin,
char *prefixes)
{
NICK_REC *rec;
@ -46,6 +47,10 @@ NICK_REC *irc_nicklist_insert(IRC_CHANNEL_REC *channel, const char *nick,
if (voice) rec->voice = TRUE;
rec->send_massjoin = send_massjoin;
if (prefixes != NULL) {
strocpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
}
nicklist_insert(CHANNEL(channel), rec);
return rec;
}
@ -159,8 +164,7 @@ static void event_names_list(IRC_SERVER_REC *server, const char *data)
if (nicklist_find((CHANNEL_REC *) chanrec, ptr) == NULL) {
rec = irc_nicklist_insert(chanrec, ptr, op, halfop,
voice, FALSE);
memcpy(rec->prefixes, prefixes, sizeof(rec->prefixes));
voice, FALSE, prefixes);
}
}
@ -187,7 +191,7 @@ static void event_end_of_names(IRC_SERVER_REC *server, const char *data)
nicks = g_hash_table_size(chanrec->nicks);
ownnick = irc_nicklist_insert(chanrec, server->nick,
nicks == 0, FALSE,
FALSE, FALSE);
FALSE, FALSE, NULL);
}
nicklist_set_own(CHANNEL(chanrec), ownnick);
chanrec->chanop = chanrec->ownnick->op;