StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge branch 'copy_chatlist' of https://github.com/JFreegman/toxcore

Browse Source
This commit is contained in:
irungentoo 2014-10-15 20:00:10 -04:00
commit 34311d1ba8
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
toxcore/group.c
View File

@ -1025,7 +1025,7 @@ static void handle_friend_invite_packet(Messenger *m, int32_t friendnumber, cons
return; return;
uint16_t peer_number = rand(); /* TODO: what if two people enter the group at the same time and uint16_t peer_number = rand(); /* TODO: what if two people enter the group at the same time and
are given the same peer_number by different nodes? */ are given the same peer_number by different nodes? */
unsigned int tries = 0; unsigned int tries = 0;
while (get_peer_index(g, peer_number) != -1) { while (get_peer_index(g, peer_number) != -1) {
@ -1670,25 +1670,24 @@ uint32_t count_chatlist(Group_Chats *g_c)
* Otherwise, returns the number of elements copied. * Otherwise, returns the number of elements copied.
* If the array was too small, the contents * If the array was too small, the contents
* of out_list will be truncated to list_size. */ * of out_list will be truncated to list_size. */
/* uint32_t copy_chatlist(Group_Chats *g_c, int32_t *out_list, uint32_t list_size)
uint32_t copy_chatlist(const Messenger *m, int *out_list, uint32_t list_size)
{ {
if (!out_list) if (!out_list) {
return 0;
if (m->numchats == 0) {
return 0; return 0;
} }
uint32_t i; if (g_c->num_chats == 0) {
uint32_t ret = 0; return 0;
}
for (i = 0; i < m->numchats; i++) { uint32_t i, ret = 0;
for (i = 0; i < g_c->num_chats; ++i) {
if (ret >= list_size) { if (ret >= list_size) {
break; *//* Abandon ship *//* break; /* Abandon ship */
} }
if (m->chats[i]) { if (g_c->chats[i].status > GROUPCHAT_STATUS_NONE) {
out_list[ret] = i; out_list[ret] = i;
ret++; ret++;
} }
@ -1696,4 +1695,3 @@ uint32_t copy_chatlist(const Messenger *m, int *out_list, uint32_t list_size)
return ret; return ret;
} }
*/

7
toxcore/group.h
View File

@ -214,6 +214,13 @@ int group_names(const Group_Chats *g_c, int groupnumber, uint8_t names[][MAX_NAM
*/ */
uint32_t count_chatlist(Group_Chats *g_c); uint32_t count_chatlist(Group_Chats *g_c);
/* Copy a list of valid chat IDs into the array out_list.
* If out_list is NULL, returns 0.
* Otherwise, returns the number of elements copied.
* If the array was too small, the contents
* of out_list will be truncated to list_size. */
uint32_t copy_chatlist(Group_Chats *g_c, int32_t *out_list, uint32_t list_size);
/* Send current name (set in messenger) to all online groups. /* Send current name (set in messenger) to all online groups.
*/ */
void send_name_all_groups(Group_Chats *g_c); void send_name_all_groups(Group_Chats *g_c);

5
toxcore/tox.c
View File

@ -723,11 +723,10 @@ uint32_t tox_count_chatlist(const Tox *tox)
* Otherwise, returns the number of elements copied. * Otherwise, returns the number of elements copied.
* If the array was too small, the contents * If the array was too small, the contents
* of out_list will be truncated to list_size. */ * of out_list will be truncated to list_size. */
uint32_t tox_get_chatlist(const Tox *tox, int *out_list, uint32_t list_size) uint32_t tox_get_chatlist(const Tox *tox, int32_t *out_list, uint32_t list_size)
{ {
const Messenger *m = tox; const Messenger *m = tox;
//return copy_chatlist(m, out_list, list_size); return copy_chatlist(m->group_chat_object, out_list, list_size);
return 0;
} }

2
toxcore/tox.h
View File

@ -537,7 +537,7 @@ uint32_t tox_count_chatlist(const Tox *tox);
* Otherwise, returns the number of elements copied. * Otherwise, returns the number of elements copied.
* If the array was too small, the contents * If the array was too small, the contents
* of out_list will be truncated to list_size. */ * of out_list will be truncated to list_size. */
uint32_t tox_get_chatlist(const Tox *tox, int *out_list, uint32_t list_size); uint32_t tox_get_chatlist(const Tox *tox, int32_t *out_list, uint32_t list_size);
/****************AVATAR FUNCTIONS*****************/ /****************AVATAR FUNCTIONS*****************/