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

fix group join bug

Browse Source
This commit is contained in:
Jfreegman 2013-09-21 22:18:02 -04:00
parent 1e44018d2e
commit eea27e72ca
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/commands.c
View File

@ -18,7 +18,7 @@ extern char *DATA_FILE;
extern uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE]; extern uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
extern uint8_t num_frnd_requests; extern uint8_t num_frnd_requests;
extern uint8_t pending_grp_requests[MAX_GROUPCHAT_NUM][TOX_CLIENT_ID_SIZE]; extern uint8_t pending_grp_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
extern uint8_t num_grp_requests; extern uint8_t num_grp_requests;
/* command functions */ /* command functions */

21
src/prompt.c
View File

@ -17,7 +17,7 @@
uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE]; uint8_t pending_frnd_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
uint8_t num_frnd_requests = 0; uint8_t num_frnd_requests = 0;
uint8_t pending_grp_requests[MAX_GROUPCHAT_NUM][TOX_CLIENT_ID_SIZE]; uint8_t pending_grp_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];
uint8_t num_grp_requests = 0; uint8_t num_grp_requests = 0;
static char prompt_buf[MAX_STR_SIZE] = {'\0'}; static char prompt_buf[MAX_STR_SIZE] = {'\0'};
@ -66,12 +66,12 @@ int add_friend_req(uint8_t *public_key)
} }
/* Adds group chat invite to pending group chat requests. /* Adds group chat invite to pending group chat requests.
Returns group number on success, -1 if queue is full or other error. */ Returns friend number on success, -1 if queue is full or other error. */
int add_group_req(uint8_t *group_pub_key) int add_group_req(uint8_t *group_pub_key, int f_num)
{ {
if (num_grp_requests < MAX_GROUPCHAT_NUM) { if (num_grp_requests++ < MAX_GROUPCHAT_NUM) {
memcpy(pending_grp_requests[num_grp_requests++], group_pub_key, TOX_CLIENT_ID_SIZE); memcpy(pending_grp_requests[f_num], group_pub_key, TOX_CLIENT_ID_SIZE);
return num_grp_requests - 1; return f_num;
} }
return -1; return -1;
@ -259,7 +259,7 @@ static void prompt_onGroupInvite(ToxWindow *self, Tox *m, int friendnumber, uint
return; return;
} }
int n = add_group_req(group_pub_key); int n = add_group_req(group_pub_key, friendnumber);
if (n == -1) { if (n == -1) {
wprintw(self->window, "\nGroup chat queue is full. Discarding invite.\n"); wprintw(self->window, "\nGroup chat queue is full. Discarding invite.\n");
@ -287,12 +287,7 @@ void prompt_init_statusbar(ToxWindow *self, Tox *m)
snprintf(statusbar->nick, sizeof(statusbar->nick), "%s", nick); snprintf(statusbar->nick, sizeof(statusbar->nick), "%s", nick);
/* temporary until statusmessage saving works */ /* temporary until statusmessage saving works */
uint8_t statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH]; uint8_t *statusmsg = "Toxing on Toxic v.0.2.1";
char toxic_ver[strlen(TOXICVER)+1];
strcpy(toxic_ver, TOXICVER);
char *L = strchr(toxic_ver, '_');
toxic_ver[L-toxic_ver] = '\0';
snprintf(statusmsg, sizeof(statusmsg), "Toxing on Toxic v.%s", toxic_ver);
m_set_statusmessage(m, statusmsg, strlen(statusmsg) + 1); m_set_statusmessage(m, statusmsg, strlen(statusmsg) + 1);
snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg); snprintf(statusbar->statusmsg, sizeof(statusbar->statusmsg), "%s", statusmsg);