emdee/tox-weechat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use Tox ID instead of peer number to index nicks in group chats.

Browse source
This commit is contained in:
Håvard Pettersson 2014-11-22 22:32:32 +01:00
parent a5c4023f9e
commit b1d16a086d
2 changed files with 47 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/twc-tox-callbacks.c
View file

@ -328,26 +328,34 @@ twc_group_namelist_change_callback(Tox *tox,
char *name = twc_get_peer_name_nt(profile->tox, group_number, peer_number);
char *prev_name = NULL;
if (change_type == TOX_CHAT_CHANGE_PEER_DEL
|| change_type == TOX_CHAT_CHANGE_PEER_NAME)
uint8_t pubkey[TOX_CLIENT_ID_SIZE];
int pkrc = tox_group_peer_pubkey(profile->tox, group_number,
peer_number, pubkey);
if (pkrc == 0)
{
nick = weechat_hashtable_get(chat->nicks, &peer_number);
if (nick)
if (change_type == TOX_CHAT_CHANGE_PEER_DEL
|| change_type == TOX_CHAT_CHANGE_PEER_NAME)
{
prev_name = strdup(weechat_nicklist_nick_get_string(chat->buffer,
nick, "name"));
weechat_nicklist_remove_nick(chat->buffer, nick);
weechat_hashtable_remove(chat->nicks, &peer_number);
nick = weechat_hashtable_get(chat->nicks, pubkey);
if (nick)
{
prev_name = strdup(weechat_nicklist_nick_get_string(chat->buffer,
nick, "name"));
weechat_nicklist_remove_nick(chat->buffer, nick);
weechat_hashtable_remove(chat->nicks, pubkey);
}
}
}
if (change_type == TOX_CHAT_CHANGE_PEER_ADD
|| change_type == TOX_CHAT_CHANGE_PEER_NAME)
{
nick = weechat_nicklist_add_nick(chat->buffer, chat->nicklist_group,
name, NULL, NULL, NULL, 1);
if (nick)
weechat_hashtable_set(chat->nicks, &peer_number, nick);
if (change_type == TOX_CHAT_CHANGE_PEER_ADD
|| change_type == TOX_CHAT_CHANGE_PEER_NAME)
{
nick = weechat_nicklist_add_nick(chat->buffer, chat->nicklist_group,
name, NULL, NULL, NULL, 1);
if (nick)
weechat_hashtable_set_with_size(chat->nicks,
pubkey, TOX_CLIENT_ID_SIZE,
nick, 0);
}
}
switch (change_type)