Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-26 22:03:27 +01:00
Code Issues Projects Releases Wiki Activity

some minor fixes

Browse Source
This commit is contained in:
Jfreegman 2013-11-10 23:17:46 -05:00
parent bc4e089a65
commit 26d561eb77
4 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/chat.c
View File

@ -232,7 +232,7 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int friendnumber, uint8_
if (tox_getname(m, friendnumber, name) == -1) if (tox_getname(m, friendnumber, name) == -1)
return; return;
wprintw(ctx->history, "Group chat invite from %s.\n", name); wprintw(ctx->history, "%s has invited you to a group chat.\n", name);
int ngc = get_num_groupchats(); int ngc = get_num_groupchats();
@ -244,7 +244,7 @@ static void chat_onGroupInvite(ToxWindow *self, Tox *m, int friendnumber, uint8_
int n = add_group_request(group_pub_key, friendnumber); int n = add_group_request(group_pub_key, friendnumber);
if (n == -1) { if (n == -1) {
wprintw(ctx->history, "Something bad happened.\n"); wprintw(ctx->history, "Something bad happened. Discarding invite.\n");
return; return;
} }

1
src/chat_commands.c
View File

@ -11,7 +11,6 @@
#include "toxic_windows.h" #include "toxic_windows.h"
#include "misc_tools.h" #include "misc_tools.h"
#include "execute.h"
extern uint8_t pending_grp_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE]; extern uint8_t pending_grp_requests[MAX_FRIENDS_NUM][TOX_CLIENT_ID_SIZE];

5
src/execute.c
View File

@ -78,8 +78,8 @@ static int parse_command(WINDOW *w, char *cmd, char (*args)[MAX_STR_SIZE])
} }
/* Matches command to respective function. Returns 0 on match, 1 on no match */ /* Matches command to respective function. Returns 0 on match, 1 on no match */
static int do_command(WINDOW *w, ToxWindow *prompt, Tox *m, int num_args, static int do_command(WINDOW *w, ToxWindow *prompt, Tox *m, int num_args, int num_cmds,
int num_cmds, struct cmd_func *commands, char (*args)[MAX_STR_SIZE]) struct cmd_func *commands, char (*args)[MAX_STR_SIZE])
{ {
int i; int i;
@ -119,6 +119,5 @@ void execute(WINDOW *w, ToxWindow *prompt, Tox *m, char *cmd, int mode)
if (do_command(w, prompt, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0) if (do_command(w, prompt, m, num_args, GLOBAL_NUM_COMMANDS, global_commands, args) == 0)
return; return;
wprintw(w, "Invalid command.\n"); wprintw(w, "Invalid command.\n");
} }

1
src/global_commands.c
View File

@ -11,7 +11,6 @@
#include "toxic_windows.h" #include "toxic_windows.h"
#include "misc_tools.h" #include "misc_tools.h"
#include "execute.h"
extern char *DATA_FILE; extern char *DATA_FILE;