1 files changed, 13 insertions, 12 deletions

diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index 1a77440e..5b79fdef 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -10,13 +10,12 @@
 #include "../../core/Messenger.h"
 #include "../../core/network.h"
 
-#include "windows.h"
+#include "friendlist.h"
 
-extern char WINDOW_STATUS[TOXWINDOWS_MAX_NUM];
-extern int add_window(Messenger *m, ToxWindow w, int n);
-extern ToxWindow new_chat(Messenger *m, int friendnum);
-
-extern int active_window;
+static delWindowFn *del_window;
+static setActiveWindowFn *set_active_window;
+static addWindowFn *add_window;
+static char * WINDOW_STATUS;
 
 typedef struct {
   uint8_t name[MAX_NAME_LENGTH];
@@ -54,8 +53,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
     for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
       if (WINDOW_STATUS[i] == -1) {
         WINDOW_STATUS[i] = num;
-        add_window(m, new_chat(m, num), i);
-        active_window = i;
+        add_window(m, new_chat(m, num, del_window), i);
         break;
       }
     }
@@ -111,7 +109,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
       int i;
       for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
         if (WINDOW_STATUS[i] == num_selected) {
-          active_window = i;
+          set_active_window(i);
           break;
         }
       }
@@ -121,8 +119,7 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
         if (WINDOW_STATUS[i] == -1) {
           WINDOW_STATUS[i] = num_selected;
           friends[num_selected].chatwin = num_selected;
-          add_window(m, new_chat(m, num_selected), i);
-          active_window = i;
+          add_window(m, new_chat(m, num_selected, del_window), i);
           break;
         }
       }
@@ -169,7 +166,11 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 
 }
 
-ToxWindow new_friendlist() {
+ToxWindow new_friendlist(delWindowFn dw, setActiveWindowFn saw, addWindowFn aw, char * ws) {
+  del_window = dw;
+  set_active_window = saw;
+  add_window = aw;
+  WINDOW_STATUS = ws;
   ToxWindow ret;
   memset(&ret, 0, sizeof(ret));