From 05fd02767fd583108731a06cc15fcd033ef0186b Mon Sep 17 00:00:00 2001
From: irungentoo <irungentoo@gmail.com>
Date: Tue, 20 Aug 2013 14:47:32 -0400
Subject: [PATCH] Refactor of core done.

---
 chat.c       | 2 +-
 dhtstatus.c  | 4 ++--
 friendlist.c | 2 +-
 prompt.c     | 2 +-
 windows.c    | 2 +-
 windows.h    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/chat.c b/chat.c
index 57404a5..d3e68ec 100644
--- a/chat.c
+++ b/chat.c
@@ -342,7 +342,7 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
         wprintw(ctx->history, "Invalid command.\n");
 }
 
-static void chat_onDraw(ToxWindow *self)
+static void chat_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(1);
     int x, y;
diff --git a/dhtstatus.c b/dhtstatus.c
index c7a57c7..6c9f2a8 100644
--- a/dhtstatus.c
+++ b/dhtstatus.c
@@ -34,9 +34,9 @@ static void dhtstatus_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void dhtstatus_onDraw(ToxWindow *self)
+static void dhtstatus_onDraw(ToxWindow *self, Messenger *m)
 {
-    Client_data   *close_clientlist = DHT_get_close_list(temp_DHT);
+    Client_data   *close_clientlist = DHT_get_close_list(m->dht);
     curs_set(0);
     werase(self->window);
 
diff --git a/friendlist.c b/friendlist.c
index 0a58bc5..2e46f12 100644
--- a/friendlist.c
+++ b/friendlist.c
@@ -102,7 +102,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void friendlist_onDraw(ToxWindow *self)
+static void friendlist_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(0);
     werase(self->window);
diff --git a/prompt.c b/prompt.c
index 204cd7e..12f8a20 100644
--- a/prompt.c
+++ b/prompt.c
@@ -460,7 +460,7 @@ static void prompt_onKey(ToxWindow *self, Messenger *m, int key)
     }
 }
 
-static void prompt_onDraw(ToxWindow *self)
+static void prompt_onDraw(ToxWindow *self, Messenger *m)
 {
     curs_set(1);
     int x, y;
diff --git a/windows.c b/windows.c
index c0ff302..de92432 100644
--- a/windows.c
+++ b/windows.c
@@ -225,7 +225,7 @@ void draw_active_window(Messenger *m)
     prepare_window(a->window);
     a->blink = false;
     draw_bar();
-    a->onDraw(a);
+    a->onDraw(a, m);
 
     /* Handle input */
     int ch = getch();
diff --git a/windows.h b/windows.h
index be5557e..86917db 100644
--- a/windows.h
+++ b/windows.h
@@ -24,7 +24,7 @@ typedef struct ToxWindow_ ToxWindow;
 
 struct ToxWindow_ {
     void(*onKey)(ToxWindow *, Messenger *, int);
-    void(*onDraw)(ToxWindow *);
+    void(*onDraw)(ToxWindow *, Messenger *);
     void(*onInit)(ToxWindow *, Messenger *);
     void(*onFriendRequest)(ToxWindow *, uint8_t *, uint8_t *, uint16_t);
     void(*onMessage)(ToxWindow *, Messenger *, int, uint8_t *, uint16_t);