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

bug of creating duplicate buffers fixed

Browse Source
This commit is contained in:
Gordon Quad 2016-12-06 14:17:19 +00:00
parent de6ba32b25
commit 8d395d8011
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/twc-chat.c
View File

@ -62,9 +62,24 @@ twc_chat_new(struct t_twc_profile *profile, const char *name)
size_t full_name_size = strlen(profile->name) + 1 + strlen(name) + 1; size_t full_name_size = strlen(profile->name) + 1 + strlen(name) + 1;
char *full_name = malloc(full_name_size); char *full_name = malloc(full_name_size);
snprintf(full_name, full_name_size, "%s/%s", profile->name, name); snprintf(full_name, full_name_size, "%s/%s", profile->name, name);
chat->buffer = weechat_buffer_search("tox", full_name);
if (!(chat->buffer))
{
chat->buffer = weechat_buffer_new(full_name, chat->buffer = weechat_buffer_new(full_name,
twc_chat_buffer_input_callback, chat, NULL, twc_chat_buffer_input_callback, chat, NULL,
twc_chat_buffer_close_callback, chat, NULL); twc_chat_buffer_close_callback, chat, NULL);
}
else
{
weechat_buffer_set_pointer(chat->buffer,
"input_callback",
twc_chat_buffer_input_callback);
weechat_buffer_set_pointer(chat->buffer, "input_callback_pointer", chat);
weechat_buffer_set_pointer(chat->buffer,
"close_callback",
twc_chat_buffer_close_callback);
weechat_buffer_set_pointer(chat->buffer, "close_callback_pointer", chat);
}
free(full_name); free(full_name);
if (!(chat->buffer)) if (!(chat->buffer))
@ -380,6 +395,7 @@ twc_chat_buffer_close_callback(const void *pointer, void *data,
void void
twc_chat_free(struct t_twc_chat *chat) twc_chat_free(struct t_twc_chat *chat)
{ {
weechat_nicklist_remove_all(chat->buffer);
if (chat->nicks) if (chat->nicks)
weechat_hashtable_free(chat->nicks); weechat_hashtable_free(chat->nicks);
free(chat); free(chat);