19 files changed, 210 insertions, 190 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 3d01d562..53ce5156 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -37,6 +37,7 @@ git checkout tags/0.4.2
 ./configure && make check
 sudo checkinstall --install --pkgname libsodium --pkgversion 0.4.2 --nodoc
 sudo ldconfig
+cd ..
 ```
 
 Or if checkinstall is not easily available for your distribution (e.g. Fedora), 
@@ -50,6 +51,7 @@ git checkout tags/0.4.2
 ./configure
 make check
 sudo make install
+cd ..
 ```
 
 
diff --git a/auto_tests/messenger_test.c b/auto_tests/messenger_test.c
index 3ca89152..9de69409 100644
--- a/auto_tests/messenger_test.c
+++ b/auto_tests/messenger_test.c
@@ -88,12 +88,12 @@ START_TEST(test_m_set_userstatus)
     uint16_t bad_length = REALLY_BIG_NUMBER;
 
     ck_assert_msg((m_set_statusmessage(m, (uint8_t *)status, bad_length) == -1),
-        "m_set_userstatus did NOT catch the following length: %d\n",
-        REALLY_BIG_NUMBER);
+                  "m_set_userstatus did NOT catch the following length: %d\n",
+                  REALLY_BIG_NUMBER);
 
     ck_assert_msg((m_set_statusmessage(m, (uint8_t *)status, good_length) == 0),
-        "m_set_userstatus did NOT return 0 on the following length: %d\n"
-        "MAX_STATUSMESSAGE_LENGTH: %d\n", good_length, MAX_STATUSMESSAGE_LENGTH);
+                  "m_set_userstatus did NOT return 0 on the following length: %d\n"
+                  "MAX_STATUSMESSAGE_LENGTH: %d\n", good_length, MAX_STATUSMESSAGE_LENGTH);
 }
 END_TEST
 
@@ -157,10 +157,10 @@ START_TEST(test_setname)
     int bad_length = REALLY_BIG_NUMBER;
 
     ck_assert_msg((setname(m, (uint8_t *)good_name, bad_length) == -1),
-        "setname() did NOT error on %d as a length argument!\n", bad_length);
+                  "setname() did NOT error on %d as a length argument!\n", bad_length);
 
     ck_assert_msg((setname(m, (uint8_t *)good_name, good_length) == 0),
-        "setname() did NOT return 0 on good arguments!\n");
+                  "setname() did NOT return 0 on good arguments!\n");
 }
 END_TEST
 
diff --git a/core/DHT.c b/core/DHT.c
index 55f34994..924e3216 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -704,6 +704,12 @@ int DHT_delfriend(uint8_t *client_id)
                         CLIENT_ID_SIZE );
             }
 
+            if (num_friends == 0) {
+                free(friends_list);
+                friends_list = NULL;
+                return 0;
+            }
+
             temp = realloc(friends_list, sizeof(Friend) * (num_friends));
 
             if (temp == NULL)
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c
index fa5f9144..506a06eb 100644
--- a/core/Lossless_UDP.c
+++ b/core/Lossless_UDP.c
@@ -319,6 +319,13 @@ static void free_connections(void)
     if (connections_length == i)
         return;
 
+    if (i == 0) {
+        free(connections);
+        connections = NULL;
+        connections_length = i;
+        return;
+    }
+
     Connection *temp;
     temp = realloc(connections, sizeof(Connection) * i);
 
diff --git a/core/Messenger.c b/core/Messenger.c
index 051078f9..7fd6a569 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -37,10 +37,15 @@ static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_i
    return -1 if realloc fails */
 int realloc_friendlist(Messenger *m, uint32_t num)
 {
-    if (num * sizeof(Friend) == 0) return -1;
-    
+    if (num == 0) {
+        free(m->friendlist);
+        m->friendlist = NULL;
+        return 0;
+    }
+
     Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend));
-    if (newfriendlist == NULL && num != 0)
+
+    if (newfriendlist == NULL)
         return -1;
 
     m->friendlist = newfriendlist;
@@ -477,6 +482,12 @@ static int send_userstatus(Messenger *m, int friendnumber, USERSTATUS status)
     return write_cryptpacket_id(m, friendnumber, PACKET_ID_USERSTATUS, &stat, sizeof(stat));
 }
 
+static int send_ping(Messenger *m, int friendnumber)
+{
+    m->friendlist[friendnumber].ping_lastsent = unix_time();
+    return write_cryptpacket_id(m, friendnumber, PACKET_ID_PING, 0, 0);
+}
+
 static int set_friend_statusmessage(Messenger *m, int friendnumber, uint8_t *status, uint16_t length)
 {
     if (friendnumber >= m->numfriends || friendnumber < 0)
@@ -591,7 +602,10 @@ int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint
 
     uint8_t packet[length + 1];
     packet[0] = packet_id;
-    memcpy(packet + 1, data, length);
+
+    if (length != 0)
+        memcpy(packet + 1, data, length);
+
     return write_cryptpacket(m->friendlist[friendnumber].crypt_connection_id, packet, length + 1);
 }
 
@@ -654,6 +668,7 @@ void doFriends(Messenger *m)
     uint32_t i;
     int len;
     uint8_t temp[MAX_DATA_SIZE];
+    uint64_t temp_time = unix_time();
 
     for (i = 0; i < m->numfriends; ++i) {
         if (m->friendlist[i].status == FRIEND_ADDED) {
@@ -662,7 +677,7 @@ void doFriends(Messenger *m)
 
             if (fr >= 0) {
                 set_friend_status(m, i, FRIEND_REQUESTED);
-                m->friendlist[i].friendrequest_lastsent = unix_time();
+                m->friendlist[i].friendrequest_lastsent = temp_time;
             }
         }
 
@@ -671,7 +686,7 @@ void doFriends(Messenger *m)
             if (m->friendlist[i].status == FRIEND_REQUESTED) {
                 /* If we didn't connect to friend after successfully sending him a friend request the request is deemed
                    unsuccessful so we set the status back to FRIEND_ADDED and try again.*/
-                if (m->friendlist[i].friendrequest_lastsent + m->friendlist[i].friendrequest_timeout < unix_time()) {
+                if (m->friendlist[i].friendrequest_lastsent + m->friendlist[i].friendrequest_timeout < temp_time) {
                     set_friend_status(m, i, FRIEND_ADDED);
                     /* Double the default timeout everytime if friendrequest is assumed to have been
                        sent unsuccessfully. */
@@ -693,6 +708,7 @@ void doFriends(Messenger *m)
                     m->friendlist[i].name_sent = 0;
                     m->friendlist[i].userstatus_sent = 0;
                     m->friendlist[i].statusmessage_sent = 0;
+                    m->friendlist[i].ping_lastrecv = temp_time;
                     break;
 
                 case 4:
@@ -721,6 +737,10 @@ void doFriends(Messenger *m)
                     m->friendlist[i].userstatus_sent = 1;
             }
 
+            if (m->friendlist[i].ping_lastsent + FRIEND_PING_INTERVAL < temp_time) {
+                send_ping(m, i);
+            }
+
             len = read_cryptpacket(m->friendlist[i].crypt_connection_id, temp);
             uint8_t packet_id = temp[0];
             uint8_t *data = temp + 1;
@@ -728,6 +748,11 @@ void doFriends(Messenger *m)
 
             if (len > 0) {
                 switch (packet_id) {
+                    case PACKET_ID_PING: {
+                        m->friendlist[i].ping_lastrecv = temp_time;
+                        break;
+                    }
+
                     case PACKET_ID_NICKNAME: {
                         if (data_length >= MAX_NAME_LENGTH || data_length == 0)
                             break;
@@ -816,6 +841,13 @@ void doFriends(Messenger *m)
 
                 break;
             }
+
+            if (m->friendlist[i].ping_lastrecv + FRIEND_CONNECTION_TIMEOUT < temp_time) {
+                /* if we stopped recieving ping packets kill it */
+                crypto_kill(m->friendlist[i].crypt_connection_id);
+                m->friendlist[i].crypt_connection_id = -1;
+                set_friend_status(m, i, FRIEND_CONFIRMED);
+            }
         }
     }
 }
diff --git a/core/Messenger.h b/core/Messenger.h
index 20ea33fb..9016be93 100644
--- a/core/Messenger.h
+++ b/core/Messenger.h
@@ -40,6 +40,7 @@ extern "C" {
 
 #define FRIEND_ADDRESS_SIZE (crypto_box_PUBLICKEYBYTES + sizeof(uint32_t) + sizeof(uint16_t))
 
+#define PACKET_ID_PING 0
 #define PACKET_ID_NICKNAME 48
 #define PACKET_ID_STATUSMESSAGE 49
 #define PACKET_ID_USERSTATUS 50
@@ -71,6 +72,12 @@ extern "C" {
 /* Default start timeout in seconds between friend requests */
 #define FRIENDREQUEST_TIMEOUT 5;
 
+/* interval between the sending of ping packets.*/
+#define FRIEND_PING_INTERVAL 5
+
+/* If no packets are recieved from friend in this time interval, kill the connection.*/
+#define FRIEND_CONNECTION_TIMEOUT (FRIEND_PING_INTERVAL * 2)
+
 /* USERSTATUS
  * Represents userstatuses someone can have. */
 
@@ -100,6 +107,8 @@ typedef struct {
     uint32_t message_id; /* a semi-unique id used in read receipts */
     uint8_t receives_read_receipts; /* shall we send read receipts to this person? */
     uint32_t friendrequest_nospam; /*The nospam number used in the friend request*/
+    uint64_t ping_lastrecv;
+    uint64_t ping_lastsent;
 } Friend;
 
 typedef struct Messenger {
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 6ced942b..8fcb62e1 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -406,11 +406,15 @@ static int getcryptconnection_id(uint8_t *public_key)
    return -1 if realloc fails */
 int realloc_cryptoconnection(uint32_t num)
 {
-    if (num * sizeof(Crypto_Connection) == 0) return -1;
+    if (num == 0) {
+        free(crypto_connections);
+        crypto_connections = NULL;
+        return 0;
+    }
 
     Crypto_Connection *newcrypto_connections = realloc(crypto_connections, num * sizeof(Crypto_Connection));
 
-    if (newcrypto_connections == NULL && num != 0)
+    if (newcrypto_connections == NULL)
         return -1;
 
     crypto_connections = newcrypto_connections;
@@ -665,10 +669,6 @@ static void receive_crypto(void)
             uint8_t session_key[crypto_box_PUBLICKEYBYTES];
             uint16_t len;
 
-            if (id_packet(crypto_connections[i].number) == 1)
-                /* if the packet is a friend request drop it (because we are already friends) */
-                len = read_packet(crypto_connections[i].number, temp_data);
-
             if (id_packet(crypto_connections[i].number) == 2) { /* handle handshake packet. */
                 len = read_packet(crypto_connections[i].number, temp_data);
 
@@ -686,9 +686,10 @@ static void receive_crypto(void)
                         crypto_connections[i].status = CONN_NOT_CONFIRMED; /* set it to its proper value right after. */
                     }
                 }
-            } else if (id_packet(crypto_connections[i].number) != -1) // This should not happen kill the connection if it does
+            } else if (id_packet(crypto_connections[i].number) != -1) { // This should not happen kill the connection if it does
                 crypto_kill(crypto_connections[i].number);
-
+                return;
+            }
         }
 
         if (crypto_connections[i].status == CONN_NOT_CONFIRMED) {
@@ -710,12 +711,16 @@ static void receive_crypto(void)
 
                     /* connection is accepted so we disable the auto kill by setting it to about 1 month from now. */
                     kill_connection_in(crypto_connections[i].number, 3000000);
-                } else
+                } else {
                     crypto_kill(crypto_connections[i].number); // This should not happen kill the connection if it does
+                    return;
+                }
             } else if (id_packet(crypto_connections[i].number) != -1)
                 /* This should not happen
                    kill the connection if it does */
                 crypto_kill(crypto_connections[i].number);
+
+            return;
         }
     }
 }
diff --git a/other/CMakeLists.txt b/other/CMakeLists.txt
index db742e3e..871a9e92 100644
--- a/other/CMakeLists.txt
+++ b/other/CMakeLists.txt
@@ -1,9 +1,24 @@
 cmake_minimum_required(VERSION 2.6.0)
 
 cmake_policy(SET CMP0011 NEW)
+SET(USER_NAME $ENV{USERNAME} CACHE STRING UserName)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DHT_bootstrap.cmake)
 
+if(WIN32)
+  file(MAKE_DIRECTORY "C:/Users/${USER_NAME}/AppData/Roaming/.config/tox")
+  file(INSTALL DHTservers DESTINATION "C:/Users/${USER_NAME}/AppData/Roaming/.config/tox")
+else()
+  set(HOME "$ENV{HOME}")
+  if(APPLE)
+    file(MAKE_DIRECTORY ${HOME}/Library/Application\ Support/.config/tox)
+    file(INSTALL DHTservers DESTINATION ${HOME}/Library/Application\ Support/.config/tox)
+  else()
+    file(MAKE_DIRECTORY ${HOME}/.config/tox)
+    file(INSTALL DHTservers DESTINATION ${HOME}/.config/tox)
+  endif()
+endif()
+
 if(LINUX)
         add_subdirectory(bootstrap_serverdaemon)
 endif()
diff --git a/other/DHTservers b/other/DHTservers
index 6efba882..bf2d2728 100644
--- a/other/DHTservers
+++ b/other/DHTservers
@@ -5,3 +5,5 @@
 81.224.34.47 443 48F0D94C0D54EB1995A2ECEDE7DB6BDD5E05D81704B2F3D1BB9FE43AC97B7269
 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
 95.47.140.214 33445 F4BF7C5A9D0EF4CB684090C38DE937FAE1612021F21FEA4DCBFAC6AAFEF58E68
+54.215.145.71 33445 6EDDEE2188EF579303C0766B4796DCBA89C93058B6032FEA51593DCD42FB746C
+66.74.30.125 33445 7155386A691E7BD3C4C0589D70ACDA191D488634772885CCED5DD7B3F7E6310D
diff --git a/testing/toxic/chat.c b/testing/toxic/chat.c
index ef932cd2..57404a59 100644
--- a/testing/toxic/chat.c
+++ b/testing/toxic/chat.c
@@ -123,8 +123,7 @@ static void chat_onStatusChange(ToxWindow *self, int num, uint8_t *status, uint1
 
     status[len - 1] = '\0';
     fix_name(status);
-    snprintf(self->title, sizeof(self->title), "[%s (%d)]", status, num);
-
+    
     wattron(ctx->history, COLOR_PAIR(3));
     wprintw(ctx->history, "* Your partner changed status to '%s'\n", status);
     wattroff(ctx->history, COLOR_PAIR(3));
@@ -335,7 +334,8 @@ void execute(ToxWindow *self, ChatContext *ctx, Messenger *m, char *cmd)
     else if (strcmp(ctx->line, "/close") == 0) {
         int f_num = ctx->friendnum;
         delwin(ctx->linewin);
-        del_window(self, f_num);
+        del_window(self);
+        disable_chatwin(f_num);
     }
 
     else
diff --git a/testing/toxic/configdir.c b/testing/toxic/configdir.c
index 1a62e8ed..a43dd1de 100644
--- a/testing/toxic/configdir.c
+++ b/testing/toxic/configdir.c
@@ -98,14 +98,18 @@ char *get_user_config_dir(void)
 
     snprintf(user_config_dir, len, "%s/Library/Application Support", home);
 # else /* __APPLE__ */
-    len = strlen(home) + strlen("/.config") + 1;
-    user_config_dir = malloc(len);
 
-    if (user_config_dir == NULL) {
-        return NULL;
+    if (!(user_config_dir = getenv("XDG_CONFIG_HOME"))) {
+        len = strlen(home) + strlen("/.config") + 1;
+        user_config_dir = malloc(len);
+
+        if (user_config_dir == NULL) {
+            return NULL;
+        }
+
+        snprintf(user_config_dir, len, "%s/.config", home);
     }
 
-    snprintf(user_config_dir, len, "%s/.config", home);
 # endif /* __APPLE__ */
 
     return user_config_dir;
diff --git a/testing/toxic/configdir.h b/testing/toxic/configdir.h
index 17d95107..e886e53a 100644
--- a/testing/toxic/configdir.h
+++ b/testing/toxic/configdir.h
@@ -19,9 +19,9 @@
  */
 
 #ifdef _win32
-#define CONFIGDIR "\\toxic\\"
+#define CONFIGDIR "\\tox\\"
 #else
-#define CONFIGDIR "/toxic/"
+#define CONFIGDIR "/tox/"
 #endif
 
 #ifndef S_ISDIR
diff --git a/testing/toxic/friendlist.c b/testing/toxic/friendlist.c
index c85fd3ae..0a58bc54 100644
--- a/testing/toxic/friendlist.c
+++ b/testing/toxic/friendlist.c
@@ -13,7 +13,6 @@
 #include "windows.h"
 #include "friendlist.h"
 
-static char *WINDOW_STATUS;
 
 typedef struct {
     uint8_t name[MAX_NAME_LENGTH];
@@ -48,17 +47,7 @@ void friendlist_onMessage(ToxWindow *self, Messenger *m, int num, uint8_t *str,
         return;
 
     if (friends[num].chatwin == -1) {
-        friends[num].chatwin = num;
-        int i;
-
-        /* Find first open slot to hold chat window */
-        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);
-                break;
-            }
-        }
+        friends[num].chatwin = add_window(m, new_chat(m, num));
     }
 }
 
@@ -106,25 +95,9 @@ static void friendlist_onKey(ToxWindow *self, Messenger *m, int key)
     } else if (key == '\n') {
         /* Jump to chat window if already open */
         if (friends[num_selected].chatwin != -1) {
-            int i;
-
-            for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-                if (WINDOW_STATUS[i] == num_selected) {
-                    set_active_window(i);
-                    break;
-                }
-            }
+            set_active_window(friends[num_selected].chatwin);
         } else {
-            int i;
-
-            for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-                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);
-                    break;
-                }
-            }
+            friends[num_selected].chatwin = add_window(m, new_chat(m, num_selected));
         }
     }
 }
@@ -172,9 +145,8 @@ static void friendlist_onInit(ToxWindow *self, Messenger *m)
 
 }
 
-ToxWindow new_friendlist(char *ws)
+ToxWindow new_friendlist()
 {
-    WINDOW_STATUS = ws;
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
 
diff --git a/testing/toxic/friendlist.h b/testing/toxic/friendlist.h
index f0c27f53..91b917fd 100644
--- a/testing/toxic/friendlist.h
+++ b/testing/toxic/friendlist.h
@@ -4,7 +4,7 @@
 #include "windows.h"
 #include "chat.h"
 
-ToxWindow new_friendlist(char *ws);
+ToxWindow new_friendlist();
 int friendlist_onFriendAdded(Messenger *m, int num);
 void disable_chatwin(int f_num);
 void fix_name(uint8_t *name);
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 2da87bc6..9abe8de4 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -27,6 +27,7 @@
 
 /* Export for use in Callbacks */
 char *DATA_FILE = NULL;
+char *SRVLIST_FILE = NULL;
 
 void on_window_resize(int sig)
 {
@@ -74,10 +75,12 @@ static Messenger *init_tox()
     m_callback_action(m, on_action, NULL);
 #ifdef __linux__
     setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
-#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
+#elif defined(WIN32)
     setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
+#elif defined(__APPLE__)
+    setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters
 #else
-    setname(m, (uint8_t *) "Hipster", sizeof("Hipster"));
+    setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4"));
 #endif
     return m;
 }
@@ -89,14 +92,12 @@ static Messenger *init_tox()
 /* Connects to a random DHT server listed in the DHTservers file */
 int init_connection(void)
 {
+    FILE *fp = NULL;
+    
     if (DHT_isconnected())
         return 0;
 
-    #if defined(WIN32) || defined(_WIN32) || defined(__WIN32) && !defined(__CYGWIN__)
-        FILE *fp = fopen("DHTservers", "r");
-    #else
-        FILE *fp = fopen("~/.tox/DHTservers", "r"); 
-    #endif
+    fp = fopen(SRVLIST_FILE, "r");
 
     if (!fp)
         return 1;
@@ -290,11 +291,17 @@ int main(int argc, char *argv[])
 
         if (config_err) {
             DATA_FILE = strdup("data");
+            SRVLIST_FILE = strdup("../../other/DHTservers");
         } else {
             DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
             strcpy(DATA_FILE, user_config_dir);
             strcat(DATA_FILE, CONFIGDIR);
             strcat(DATA_FILE, "data");
+            
+            SRVLIST_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("DHTservers") + 1);
+            strcpy(SRVLIST_FILE, user_config_dir);
+            strcat(SRVLIST_FILE, CONFIGDIR);
+            strcat(SRVLIST_FILE, "DHTservers");
         }
     }
 
@@ -303,7 +310,6 @@ int main(int argc, char *argv[])
     init_term();
     Messenger *m = init_tox();
     ToxWindow *prompt = init_windows(m);
-    init_window_status();
 
     if (f_loadfromfile)
         load_data(m, DATA_FILE);
@@ -332,5 +338,6 @@ int main(int argc, char *argv[])
 
     cleanupMessenger(m);
     free(DATA_FILE);
+    free(SRVLIST_FILE);
     return 0;
 }
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index a37fdaaa..473633d4 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -19,7 +19,6 @@ extern int store_data(Messenger *m, char *path);
 uint8_t pending_requests[MAX_STR_SIZE][CLIENT_ID_SIZE]; // XXX
 uint8_t num_requests = 0; // XXX
 
-static friendAddedFn *on_friendadded_cb;
 static char prompt_buf[MAX_STR_SIZE] = {0};
 static int prompt_buf_pos = 0;
 
@@ -97,7 +96,7 @@ void cmd_accept(ToxWindow *self, Messenger *m, char **args)
         wprintw(self->window, "Failed to add friend.\n");
     else {
         wprintw(self->window, "Friend accepted as: %d.\n", num);
-        on_friendadded_cb(m, num);
+        on_friendadded(m, num);
     }
 }
 
@@ -174,7 +173,7 @@ void cmd_add(ToxWindow *self, Messenger *m, char **args)
 
         default:
             wprintw(self->window, "Friend added as %d.\n", num);
-            on_friendadded_cb(m, num);
+            on_friendadded(m, num);
             break;
     }
 }
@@ -273,6 +272,7 @@ void cmd_nick(ToxWindow *self, Messenger *m, char **args)
     char *nick = args[1];
     setname(m, (uint8_t *) nick, strlen(nick) + 1);
     wprintw(self->window, "Nickname set to: %s\n", nick);
+
     if (store_data(m, DATA_FILE)) {
         wprintw(self->window, "\nCould not store Messenger data\n");
     }
@@ -480,9 +480,8 @@ static void prompt_onInit(ToxWindow *self, Messenger *m)
     wclrtoeol(self->window);
 }
 
-ToxWindow new_prompt(friendAddedFn *f)
+ToxWindow new_prompt()
 {
-    on_friendadded_cb = f;
     ToxWindow ret;
     memset(&ret, 0, sizeof(ret));
     ret.onKey = &prompt_onKey;
diff --git a/testing/toxic/prompt.h b/testing/toxic/prompt.h
index 6c5320ab..8e12a42f 100644
--- a/testing/toxic/prompt.h
+++ b/testing/toxic/prompt.h
@@ -3,9 +3,7 @@
 
 #include "windows.h"
 
-typedef void (friendAddedFn)(Messenger *m, int friendnumber);
-
-ToxWindow new_prompt(friendAddedFn *f);
+ToxWindow new_prompt();
 int add_req(uint8_t *public_key);
 unsigned char *hex_string_to_bin(char hex_string[]);
 
diff --git a/testing/toxic/windows.c b/testing/toxic/windows.c
index 11396e2c..c0ff3026 100644
--- a/testing/toxic/windows.c
+++ b/testing/toxic/windows.c
@@ -6,15 +6,10 @@
 extern char *DATA_FILE;
 extern int store_data(Messenger *m, char *path);
 
-/* Holds status of chat windows */
-char WINDOW_STATUS[MAX_WINDOW_SLOTS];
-
-static int w_num;
-static ToxWindow windows[MAX_WINDOW_SLOTS];
-static Messenger *m;
-int active_window;
-
+static ToxWindow windows[MAX_WINDOWS_NUM];
+static ToxWindow *active_window;
 static ToxWindow *prompt;
+static Messenger *m;
 
 /* CALLBACKS START */
 void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userdata)
@@ -31,7 +26,7 @@ void on_request(uint8_t *public_key, uint8_t *data, uint16_t length, void *userd
     wprintw(prompt->window, "\nWith the message: %s\n", data);
     wprintw(prompt->window, "\nUse \"accept %d\" to accept it.\n", n);
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onFriendRequest != NULL)
             windows[i].onFriendRequest(&windows[i], public_key, data, length);
     }
@@ -41,7 +36,7 @@ void on_message(Messenger *m, int friendnumber, uint8_t *string, uint16_t length
 {
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onMessage != NULL)
             windows[i].onMessage(&windows[i], m, friendnumber, string, length);
     }
@@ -51,7 +46,7 @@ void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length,
 {
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onAction != NULL)
             windows[i].onAction(&windows[i], m, friendnumber, string, length);
     }
@@ -62,7 +57,7 @@ void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t len
     wprintw(prompt->window, "\n(nickchange) %d: %s\n", friendnumber, string);
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onNickChange != NULL)
             windows[i].onNickChange(&windows[i], friendnumber, string, length);
     }
@@ -73,7 +68,7 @@ void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t l
     wprintw(prompt->window, "\n(statuschange) %d: %s\n", friendnumber, string);
     int i;
 
-    for (i = 0; i < MAX_WINDOW_SLOTS; ++i) {
+    for (i = 0; i < MAX_WINDOWS_NUM; ++i) {
         if (windows[i].onStatusChange != NULL)
             windows[i].onStatusChange(&windows[i], friendnumber, string, length);
     }
@@ -89,119 +84,89 @@ void on_friendadded(Messenger *m, int friendnumber)
 }
 /* CALLBACKS END */
 
-int add_window(Messenger *m, ToxWindow w, int n)
+int add_window(Messenger *m, ToxWindow w)
 {
-    if (w_num >= TOXWINDOWS_MAX_NUM)
-        return -1;
-
     if (LINES < 2)
         return -1;
-
-    w.window = newwin(LINES - 2, COLS, 0, 0);
-
-    if (w.window == NULL)
-        return -1;
-
-    windows[n] = w;
-    w.onInit(&w, m);
-    w_num++;
-    active_window = n;
-    return n;
+ 
+    int i;
+    for(i = 0; i < MAX_WINDOWS_NUM; i++) {
+        if (windows[i].window) 
+            continue;
+        
+        w.window = newwin(LINES - 2, COLS, 0, 0);
+        if (w.window == NULL)
+            return -1;
+
+        windows[i] = w;
+        w.onInit(&w, m);
+    
+        active_window = windows+i;
+        return i;
+    }
+    
+    return -1;
 }
 
 /* Deletes window w and cleans up */
-void del_window(ToxWindow *w, int f_num)
+void del_window(ToxWindow *w)
 {
-    active_window = 0; // Go to prompt screen
+    active_window = windows; // Go to prompt screen
     delwin(w->window);
-    int i;
-
-    for (i = N_DEFAULT_WINS; i < MAX_WINDOW_SLOTS; ++i) {
-        if (WINDOW_STATUS[i] == f_num) {
-            WINDOW_STATUS[i] = -1;
-            disable_chatwin(f_num);
-            break;
-        }
-    }
-
+    if (w->x)
+        free(w->x);
+    w->window = NULL;
+    memset(w, 0, sizeof(ToxWindow));
     clear();
     refresh();
 }
 
 /* Shows next window when tab or back-tab is pressed */
-void set_active_window(int ch)
+void set_next_window(int ch)
 {
-    int f_inf = 0;
-    int max = MAX_WINDOW_SLOTS - 1;
-
-    if (ch == '\t') {
-        int i = (active_window + 1) % max;
-
-        while (true) {
-            if (WINDOW_STATUS[i] != -1) {
-                active_window = i;
-                return;
-            }
-
-            i = (i  + 1) % max;
-
-            if (f_inf++ > max) {    // infinite loop check
-                endwin();
-                exit(2);
-            }
-        }
-    } else {
-        int i = active_window - 1;
-
-        if (i < 0) i = max;
-
-        while (true) {
-            if (WINDOW_STATUS[i] != -1) {
-                active_window = i;
-                return;
-            }
-
-            if (--i < 0) i = max;
-
-            if (f_inf++ > max) {
-                endwin();
-                exit(2);
-            }
+    ToxWindow *end = windows+MAX_WINDOWS_NUM-1;
+    ToxWindow *inf = active_window;
+    while(true) {
+        if (ch == '\t') {
+            if (++active_window > end)
+                active_window = windows;
+        } else 
+            if (--active_window < windows)
+                active_window = end;
+        
+        if (active_window->window)
+            return;
+    
+        if (active_window == inf) {    // infinite loop check
+            endwin();
+            exit(2);
         }
     }
 }
 
-void init_window_status()
+void set_active_window(int index)
 {
-    /* Default window values decrement from -2 */
-    int i;
-
-    for (i = 0; i < N_DEFAULT_WINS; ++i)
-        WINDOW_STATUS[i] = -(i + 2);
-
-    int j;
-
-    for (j = N_DEFAULT_WINS; j < MAX_WINDOW_SLOTS; j++)
-        WINDOW_STATUS[j] = -1;
+    if (index < 0 || index >= MAX_WINDOWS_NUM)
+        return;
+    
+    active_window = windows+index;
 }
 
 ToxWindow *init_windows()
 {
-    w_num = 0;
-    int n_prompt = 0;
-    int n_friendslist = 1;
-    int n_dhtstatus = 2;
-
-    if (add_window(m, new_prompt(on_friendadded), n_prompt) == -1
-            || add_window(m, new_friendlist(WINDOW_STATUS), n_friendslist) == -1
-            || add_window(m, new_dhtstatus(), n_dhtstatus) == -1) {
+    int n_prompt = add_window(m, new_prompt());
+    
+    if (n_prompt == -1
+            || add_window(m, new_friendlist()) == -1
+            || add_window(m, new_dhtstatus()) == -1) {
         fprintf(stderr, "add_window() failed.\n");
         endwin();
         exit(1);
     }
 
-    active_window = n_prompt;
     prompt = &windows[n_prompt];
+    active_window = prompt;
+    
     return prompt;
 }
 
@@ -222,9 +187,9 @@ static void draw_bar()
 
     int i;
 
-    for (i = 0; i < (MAX_WINDOW_SLOTS); ++i) {
-        if (WINDOW_STATUS[i] != -1) {
-            if (i == active_window)
+    for (i = 0; i < (MAX_WINDOWS_NUM); ++i) {
+        if (windows[i].window) {
+            if (windows+i == active_window)
                 attron(A_BOLD);
 
             odd = (odd + 1) % blinkrate;
@@ -232,12 +197,13 @@ static void draw_bar()
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attron(COLOR_PAIR(3));
 
+            clrtoeol();
             printw(" %s", windows[i].title);
 
             if (windows[i].blink && (odd < (blinkrate / 2)))
                 attroff(COLOR_PAIR(3));
 
-            if (i == active_window) {
+            if (windows+i == active_window) {
                 attroff(A_BOLD);
             }
         }
@@ -255,7 +221,7 @@ void prepare_window(WINDOW *w)
 void draw_active_window(Messenger *m)
 {
 
-    ToxWindow *a = &windows[active_window];
+    ToxWindow *a = active_window;
     prepare_window(a->window);
     a->blink = false;
     draw_bar();
@@ -265,7 +231,7 @@ void draw_active_window(Messenger *m)
     int ch = getch();
 
     if (ch == '\t' || ch == KEY_BTAB)
-        set_active_window(ch);
+        set_next_window(ch);
     else if (ch != ERR)
         a->onKey(a, m, ch);
 }
diff --git a/testing/toxic/windows.h b/testing/toxic/windows.h
index 553a6200..be5557e9 100644
--- a/testing/toxic/windows.h
+++ b/testing/toxic/windows.h
@@ -8,7 +8,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "../../core/Messenger.h"
-#define TOXWINDOWS_MAX_NUM 32
+#define MAX_WINDOWS_NUM 32
 #define MAX_FRIENDS_NUM 100
 #define MAX_STR_SIZE 256
 #define KEY_SIZE_BYTES 32
@@ -16,9 +16,6 @@
 /* number of permanent default windows */
 #define N_DEFAULT_WINS 3
 
-/* maximum window slots for WINDOW_STATUS array */
-#define MAX_WINDOW_SLOTS N_DEFAULT_WINS+MAX_FRIENDS_NUM
-
 #ifndef TOXICVER
 #define TOXICVER "NOVER" //Use the -D flag to set this
 #endif
@@ -48,11 +45,10 @@ void on_action(Messenger *m, int friendnumber, uint8_t *string, uint16_t length,
 void on_nickchange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void on_statuschange(Messenger *m, int friendnumber, uint8_t *string, uint16_t length, void *userdata);
 void on_friendadded(Messenger *m, int friendnumber);
-void init_window_status();
 ToxWindow *init_windows();
 void draw_active_window(Messenger *m);
-int add_window(Messenger *m, ToxWindow w, int n);
-void del_window(ToxWindow *w, int f_num);
+int add_window(Messenger *m, ToxWindow w);
+void del_window(ToxWindow *w);
 void set_active_window(int ch);
 #endif