Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 04:33:01 +01:00
Code Issues Projects Releases Wiki Activity

load saved group names

Browse Source
This commit is contained in:
Jfreegman 2015-03-04 00:08:30 -05:00
parent 4cc0805036
commit 5859763f04
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/groupchat.c
View File

@ -110,6 +110,7 @@ static const char group_cmd_list[AC_NUM_GROUP_COMMANDS][MAX_CMDNAME_SIZE] = {
#endif /* AUDIO */ #endif /* AUDIO */
}; };
static void groupchat_set_group_name(ToxWindow *self, Tox *m, int groupnum);
ToxWindow new_group_chat(Tox *m, int groupnum, const char *groupname, int length); ToxWindow new_group_chat(Tox *m, int groupnum, const char *groupname, int length);
int init_groupchat_win(Tox *m, int groupnum, const char *groupname, int length) int init_groupchat_win(Tox *m, int groupnum, const char *groupname, int length)
@ -119,6 +120,10 @@ int init_groupchat_win(Tox *m, int groupnum, const char *groupname, int length)
ToxWindow self = new_group_chat(m, groupnum, groupname, length); ToxWindow self = new_group_chat(m, groupnum, groupname, length);
/* In case we're loading a saved group */
if (length <= 0)
groupchat_set_group_name(&self, m, groupnum);
int i; int i;
for (i = 0; i <= max_groupchat_index; ++i) { for (i = 0; i <= max_groupchat_index; ++i) {
@ -472,11 +477,8 @@ static void groupchat_onGroupPeerExit(ToxWindow *self, Tox *m, int groupnum, uin
sound_notify(self, silent, NT_WNDALERT_2, NULL); sound_notify(self, silent, NT_WNDALERT_2, NULL);
} }
static void groupchat_onGroupSelfJoin(ToxWindow *self, Tox *m, int groupnum) static void groupchat_set_group_name(ToxWindow *self, Tox *m, int groupnum)
{ {
if (groupnum != self->num)
return;
char tmp_groupname[TOX_MAX_GROUP_NAME_LENGTH]; char tmp_groupname[TOX_MAX_GROUP_NAME_LENGTH];
int glen = tox_group_get_group_name(m, groupnum, (uint8_t *) tmp_groupname); int glen = tox_group_get_group_name(m, groupnum, (uint8_t *) tmp_groupname);
@ -485,6 +487,14 @@ static void groupchat_onGroupSelfJoin(ToxWindow *self, Tox *m, int groupnum)
if (glen > 0) if (glen > 0)
set_window_title(self, groupname, glen); set_window_title(self, groupname, glen);
}
static void groupchat_onGroupSelfJoin(ToxWindow *self, Tox *m, int groupnum)
{
if (groupnum != self->num)
return;
groupchat_set_group_name(self, m, groupnum);
char tmp_topic[TOX_MAX_GROUP_TOPIC_LENGTH]; char tmp_topic[TOX_MAX_GROUP_TOPIC_LENGTH];
int tlen = tox_group_get_topic(m, groupnum, (uint8_t *) tmp_topic); int tlen = tox_group_get_topic(m, groupnum, (uint8_t *) tmp_topic);
@ -890,7 +900,7 @@ ToxWindow new_group_chat(Tox *m, int groupnum, const char *groupname, int length
ret.show_peerlist = true; ret.show_peerlist = true;
ret.active_box = -1; ret.active_box = -1;
if (groupname && length) if (groupname && length > 0)
set_window_title(&ret, groupname, length); set_window_title(&ret, groupname, length);
else else
snprintf(ret.name, sizeof(ret.name), "Group %d", groupnum); snprintf(ret.name, sizeof(ret.name), "Group %d", groupnum);