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

alert chat window on file send/failure

Browse Source
This commit is contained in:
Jfreegman 2013-11-19 16:00:24 -05:00
parent f43d735861
commit d8da80914d
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat_commands.c
View File

@ -166,7 +166,7 @@ void cmd_sendfile(WINDOW *window, ToxWindow *self, Tox *m, int argc, char (*argv
if (!file_senders[i].active) { if (!file_senders[i].active) {
memcpy(file_senders[i].pathname, path, path_len + 1); memcpy(file_senders[i].pathname, path, path_len + 1);
file_senders[i].active = true; file_senders[i].active = true;
file_senders[i].chatwin = window; file_senders[i].toxwin = self;
file_senders[i].file = file_to_send; file_senders[i].file = file_to_send;
file_senders[i].filenum = (uint8_t) filenum; file_senders[i].filenum = (uint8_t) filenum;
file_senders[i].friendnum = self->num; file_senders[i].friendnum = self->num;

16
src/main.c
View File

@ -379,7 +379,13 @@ static void do_file_senders(Tox *m)
/* If file transfer has timed out kill transfer and send kill control */ /* If file transfer has timed out kill transfer and send kill control */
if (timed_out(file_senders[i].timestamp, current_time, TIMEOUT_FILESENDER)) { if (timed_out(file_senders[i].timestamp, current_time, TIMEOUT_FILESENDER)) {
wprintw(file_senders[i].chatwin, "File transfer for '%s' timed out.\n", pathname); ChatContext *ctx = (ChatContext *) file_senders[i].toxwin->chatwin;
if (ctx != NULL) {
wprintw(ctx->history, "File transfer for '%s' timed out.\n", pathname);
alert_window(file_senders[i].toxwin);
}
tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_KILL, 0, 0); tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_KILL, 0, 0);
close_file_sender(i); close_file_sender(i);
continue; continue;
@ -397,7 +403,13 @@ static void do_file_senders(Tox *m)
tox_filedata_size(m, friendnum), fp); tox_filedata_size(m, friendnum), fp);
if (file_senders[i].piecelen == 0) { if (file_senders[i].piecelen == 0) {
wprintw(file_senders[i].chatwin, "File '%s' successfuly sent.\n", pathname); ChatContext *ctx = (ChatContext *) file_senders[i].toxwin->chatwin;
if (ctx != NULL) {
wprintw(ctx->history, "File '%s' successfuly sent.\n", pathname);
alert_window(file_senders[i].toxwin);
}
tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_FINISHED, 0, 0); tox_file_sendcontrol(m, friendnum, 0, filenum, TOX_FILECONTROL_FINISHED, 0, 0);
close_file_sender(i); close_file_sender(i);
break; break;

2
src/toxic_windows.h
View File

@ -107,7 +107,7 @@ typedef struct {
typedef struct { typedef struct {
FILE *file; FILE *file;
WINDOW *chatwin; ToxWindow *toxwin;
int friendnum; int friendnum;
bool active; bool active;
uint8_t filenum; uint8_t filenum;