1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-30 03:03:26 +01:00

core groupchat names should be working

This commit is contained in:
Jfreegman 2014-10-03 17:55:36 -04:00
parent 23cf9686cb
commit 9cf4427375
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63

View File

@ -230,16 +230,11 @@ static void copy_peernames(int gnum, uint8_t peerlist[][TOX_MAX_NAME_LENGTH], ui
exit_toxic_err("failed in copy_peernames", FATALERR_MEMORY); exit_toxic_err("failed in copy_peernames", FATALERR_MEMORY);
} }
uint16_t u_len = strlen("NSA Agent"); uint16_t u_len = strlen(UNKNOWN_NAME);
int i; int i;
for (i = 0; i < npeers; ++i) { for (i = 0; i < npeers; ++i) {
/* this is only temporary */ if (string_is_empty((char *) peerlist[i])) {
memcpy(&groupchats[gnum].peer_names[i * N], "NSA Agent", u_len);
groupchats[gnum].peer_names[i * N + u_len] = '\0';
groupchats[gnum].peer_name_lengths[i] = u_len;
/* if (string_is_empty((char *) peerlist[i])) {
memcpy(&groupchats[gnum].peer_names[i * N], UNKNOWN_NAME, u_len); memcpy(&groupchats[gnum].peer_names[i * N], UNKNOWN_NAME, u_len);
groupchats[gnum].peer_names[i * N + u_len] = '\0'; groupchats[gnum].peer_names[i * N + u_len] = '\0';
groupchats[gnum].peer_name_lengths[i] = u_len; groupchats[gnum].peer_name_lengths[i] = u_len;
@ -248,7 +243,7 @@ static void copy_peernames(int gnum, uint8_t peerlist[][TOX_MAX_NAME_LENGTH], ui
memcpy(&groupchats[gnum].peer_names[i * N], peerlist[i], n_len); memcpy(&groupchats[gnum].peer_names[i * N], peerlist[i], n_len);
groupchats[gnum].peer_names[i * N + n_len] = '\0'; groupchats[gnum].peer_names[i * N + n_len] = '\0';
groupchats[gnum].peer_name_lengths[i] = n_len; groupchats[gnum].peer_name_lengths[i] = n_len;
} */ }
} }
memcpy(groupchats[gnum].oldpeer_names, groupchats[gnum].peer_names, N * npeers); memcpy(groupchats[gnum].oldpeer_names, groupchats[gnum].peer_names, N * npeers);