1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-13 02:56:34 +01:00

merge with upstream

This commit is contained in:
Jfreegman
2015-02-19 21:33:46 -05:00
22 changed files with 307 additions and 150 deletions

View File

@@ -58,7 +58,7 @@ typedef struct {
int namelength;
char statusmsg[TOX_MAX_STATUSMESSAGE_LENGTH + 1];
uint16_t statusmsg_len;
char pub_key[TOX_CLIENT_ID_SIZE];
char pub_key[TOX_PUBLIC_KEY_SIZE];
int32_t num;
int chatwin;
bool active;
@@ -75,7 +75,7 @@ typedef struct {
typedef struct {
char name[TOXIC_MAX_NAME_LENGTH + 1];
int namelength;
char pub_key[TOX_CLIENT_ID_SIZE];
char pub_key[TOX_PUBLIC_KEY_SIZE];
int32_t num;
bool active;
uint64_t last_on;