From 958e77660ebd358bc3c2db2b26af3254a433fea6 Mon Sep 17 00:00:00 2001
From: Jfreegman <Jfreegman@gmail.com>
Date: Wed, 16 Oct 2013 05:00:27 -0400
Subject: [PATCH] removed unneeded var, small fixes

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

diff --git a/src/chat.c b/src/chat.c
index faba5f6..632d5b5 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -107,7 +107,7 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t fil
 
     ChatContext *ctx = (ChatContext *) self->chatwin;
 
-    wprintw(ctx->history, "File transfer request for '%s' of size %llu.\n", pathname, 
+    wprintw(ctx->history, "File transfer request for '%s' (%llu bytes).\n", pathname, 
             (long long unsigned int)filesize);
 
     if (filenum > MAX_FILENUMBER) {
@@ -219,7 +219,6 @@ 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;
diff --git a/src/main.c b/src/main.c
index b8afd31..f5ab590 100644
--- a/src/main.c
+++ b/src/main.c
@@ -347,7 +347,7 @@ static void load_data(Tox *m, char *path)
     }
 }
 
-void chat_do_file_senders(Tox *m)
+void do_file_senders(Tox *m)
 {
     int i;
 
@@ -478,7 +478,7 @@ int main(int argc, char *argv[])
 
     while (true) {
         do_tox(m, prompt);
-        chat_do_file_senders(m);
+        do_file_senders(m);
         draw_active_window(m);
     }
 
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index df96e7a..0c592a1 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -108,7 +108,6 @@ typedef struct {
     uint8_t filenum;
     uint8_t nextpiece[FILE_PIECE_SIZE];
     uint16_t piecelen;
-    uint8_t friendname[TOXIC_MAX_NAME_LENGTH];
     uint8_t pathname[MAX_STR_SIZE];
 } FileSender;