Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-05 20:46:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core

Browse Source 
Conflicts:
	core/Messenger.c
	core/Messenger.h
This commit is contained in:
Maxim Biro
2013-08-07 19:18:40 -04:00
parent 174604a448 8e881ca50f
commit 90acd2dfef
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
prompt.c
View File

@ -62,6 +62,16 @@ static void execute(ToxWindow *self, char *u_cmd)
if (!isspace(cmd[cmd_end]))
break;
cmd[cmd_end + 1] = '\0';
/* What is this supposed to do?
if (cmd[0] == '/') {
wprintw(self->window,"Warning: Run your command without the /, this may not work\n");
int i;
for (i = 1; i < strlen(cmd); i++) { //This doesn't work when it doesn't end with a space and another word
cmd[i - 1] = cmd[i]; //Still working on why
}
}
*/
if (!strcmp(cmd, "quit") || !strcmp(cmd, "exit") || !strcmp(cmd, "q")) {
endwin();
@ -287,7 +297,7 @@ static void execute(ToxWindow *self, char *u_cmd)
}
msg[0] = 0;
msg++;
if (m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) < 0)
if (m_sendmessage(atoi(id), (uint8_t*) msg, strlen(msg)+1) == 0)
wprintw(self->window, "Error occurred while sending message.\n");
else
wprintw(self->window, "Message successfully sent.\n");
@ -368,7 +378,7 @@ static void print_usage(ToxWindow *self)
wprintw(self->window, " myid : Print your ID\n");
wprintw(self->window, " quit/exit : Exit program\n");
wprintw(self->window, " help : Print this message again\n");
wprintw(self->window, " clear : Clear this window\n");
wprintw(self->window, " clear : Clear this window\n");
wattron(self->window, A_BOLD);
wprintw(self->window, "TIP: Use the TAB key to navigate through the tabs.\n\n");