1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 09:16:45 +02:00

Merge branch 'upstream'

This commit is contained in:
Simon Levermann
2013-08-08 18:06:10 +02:00
5 changed files with 62 additions and 34 deletions

7
main.c
View File

@ -31,7 +31,10 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS];
#define TOXICVER "0.1.0" //Will be moved to a -D flag later
#ifndef TOXICVER
#define TOXICVER "NOVER" //Use the -D flag to set this
#endif
static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt;
@ -46,7 +49,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length)
wprintw(prompt->window, "\nFriend request from:\n");
int i;
for (i = 0; i < 32; ++i) {
for (i = 0; i < KEY_SIZE_BYTES; ++i) {
wprintw(prompt->window, "%02x", public_key[i] & 0xff);
}