From 5f3293bfec3b5d23f1e2ee282e4ebdb3b73acc36 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Wed, 16 Oct 2013 01:55:35 -0400
Subject: [PATCH] fmove file send success message to chat window

---
 src/chat.c          |  1 +
 src/main.c          | 10 ++++------
 src/toxic_windows.h |  3 ++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/chat.c b/src/chat.c
index 97afed5..faba5f6 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -220,6 +220,7 @@ static void chat_sendfile(ToxWindow *self, ChatContext *ctx, Tox *m, uint8_t *pa
 
     memcpy(file_senders[num_file_senders].pathname, path, path_len + 1);
     memcpy(file_senders[num_file_senders].friendname, friendname, strlen(friendname) + 1);
+    file_senders[num_file_senders].chatwin = ctx->history;
     file_senders[num_file_senders].file = file_to_send;
     file_senders[num_file_senders].filenum = filenum;
     file_senders[num_file_senders].friendnum = friendnum;
diff --git a/src/main.c b/src/main.c
index 9429499..b8afd31 100644
--- a/src/main.c
+++ b/src/main.c
@@ -347,7 +347,7 @@ static void load_data(Tox *m, char *path)
     }
 }
 
-void do_file_senders(Tox *m)
+void chat_do_file_senders(Tox *m)
 {
     int i;
 
@@ -367,11 +367,9 @@ void do_file_senders(Tox *m)
                 fclose(file_senders[i].file);
                 file_senders[i].file = NULL;
                 tox_file_sendcontrol(m, file_senders[i].friendnum, 0, file_senders[i].filenum, 
-                                     3, 0, 0);
+                                     TOX_FILECONTROL_FINISHED, 0, 0);
 
-                /* TODO: move this alert to chat window */
-                wprintw(prompt->window, "File '%s' successfuly sent to %s.\n", 
-                        file_senders[i].pathname, file_senders[i].friendname);
+                wprintw(file_senders[i].chatwin, "File successfuly sent.\n");
                 return;
             }
         }
@@ -480,7 +478,7 @@ int main(int argc, char *argv[])
 
     while (true) {
         do_tox(m, prompt);
-        do_file_senders(m);
+        chat_do_file_senders(m);
         draw_active_window(m);
     }
 
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index 2d0d504..df96e7a 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -98,11 +98,12 @@ typedef struct {
 /* Start file transfer code */
 
 #define NUM_FILE_SENDERS 256
-#define MAX_FILENUMBER 100  /* fix */
+#define MAX_FILENUMBER 100
 #define FILE_PIECE_SIZE 1024
 
 typedef struct {
     FILE *file;
+    WINDOW *chatwin;
     uint16_t friendnum;
     uint8_t filenum;
     uint8_t nextpiece[FILE_PIECE_SIZE];