From 9cf4427375c06b7684cea4dd1423f0588233ed63 Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Fri, 3 Oct 2014 17:55:36 -0400 Subject: [PATCH] core groupchat names should be working --- src/groupchat.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/groupchat.c b/src/groupchat.c index f4b897a..ad935d2 100644 --- a/src/groupchat.c +++ b/src/groupchat.c @@ -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); } - uint16_t u_len = strlen("NSA Agent"); + uint16_t u_len = strlen(UNKNOWN_NAME); int i; for (i = 0; i < npeers; ++i) { - /* this is only temporary */ - 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])) { + if (string_is_empty((char *) peerlist[i])) { memcpy(&groupchats[gnum].peer_names[i * N], UNKNOWN_NAME, u_len); groupchats[gnum].peer_names[i * N + u_len] = '\0'; 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); groupchats[gnum].peer_names[i * N + n_len] = '\0'; groupchats[gnum].peer_name_lengths[i] = n_len; - } */ + } } memcpy(groupchats[gnum].oldpeer_names, groupchats[gnum].peer_names, N * npeers);