1 files changed, 15 insertions, 8 deletions

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;
 }