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

Make test clients compatible with userstatus kinds

Browse Source 
No features were added, just fixed callbacks.
This commit is contained in:
Sebastian Stal 2013-08-05 12:30:40 -07:00
parent b7f989266d
commit 5ec3b2330e
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/nTox.c
View File

@ -228,7 +228,7 @@ void line_eval(char *line)
status[i-3] = line[i];
}
status[i-3] = 0;
m_set_userstatus(status, strlen((char*)status) + 1);
m_set_userstatus(USERSTATUS_KIND_ONLINE, status, strlen((char*)status) + 1);
char numstring[100];
sprintf(numstring, "[i] changed status to %s", (char*)status);
new_lines(numstring);
@ -364,7 +364,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
}
}
void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
void print_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t *string, uint16_t length)
{
char name[MAX_NAME_LENGTH];
if(getname(friendnumber, (uint8_t*)name) != -1) {
@ -392,7 +392,7 @@ void load_key(char *path)
}
Messenger_load(data, size);
} else {
} else {
//else save new keys
int size = Messenger_size();
uint8_t data[size];

2
testing/toxic/chat.c
View File

@ -161,7 +161,7 @@ void execute(ToxWindow* self, ChatContext* ctx, char* cmd)
return;
}
msg++;
m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(ctx->history, "Status set to: %s\n", msg);
}
else if (!strncmp(cmd, "/nick ", strlen("/nick "))) {

6
testing/toxic/main.c
View File

@ -69,7 +69,7 @@ void on_nickchange(int friendnumber, uint8_t* string, uint16_t length) {
}
}
void on_statuschange(int friendnumber, uint8_t* string, uint16_t length) {
void on_statuschange(int friendnumber, USERSTATUS_KIND kind, uint8_t* string, uint16_t length) {
size_t i;
wprintw(prompt->window, "\n(statuschange) %d: %s!\n", friendnumber, string);
@ -201,7 +201,7 @@ static void load_data(char *path) {
Messenger_load(buf, len);
}
else {
else {
len = Messenger_size();
buf = malloc(len);
@ -289,7 +289,7 @@ int main(int argc, char* argv[]) {
for(i = 0; i < argc; i++) {
if (argv[i] == NULL){
break;
break;
} else if(argv[i][0] == '-') {
if(argv[i][1] == 'f') {
if(argv[i + 1] != NULL)

8
testing/toxic/prompt.c
View File

@ -91,7 +91,7 @@ static void execute(ToxWindow* self, char* cmd) {
dht.ip.i = resolved_address;
unsigned char *binary_string = hex_string_to_bin(key);
DHT_bootstrap(dht, binary_string);
free(binary_string);
free(binary_string);
}
else if(!strncmp(cmd, "add ", strlen("add "))) {
uint8_t id_bin[32];
@ -137,7 +137,7 @@ static void execute(ToxWindow* self, char* cmd) {
num = m_addfriend(id_bin, (uint8_t*) msg, strlen(msg)+1);
switch (num) {
case -1:
case -1:
wprintw(self->window, "Message is too long.\n");
break;
case -2:
@ -151,7 +151,7 @@ static void execute(ToxWindow* self, char* cmd) {
break;
case -5:
wprintw(self->window, "Undefined error when adding friend.\n");
break;
break;
default:
wprintw(self->window, "Friend added as %d.\n", num);
on_friendadded(num);
@ -172,7 +172,7 @@ static void execute(ToxWindow* self, char* cmd) {
}
msg++;
m_set_userstatus((uint8_t*) msg, strlen(msg)+1);
m_set_userstatus(USERSTATUS_KIND_RETAIN, (uint8_t*) msg, strlen(msg)+1);
wprintw(self->window, "Status set to: %s\n", msg);
}
else if(!strncmp(cmd, "nick ", strlen("nick "))) {