summaryrefslogtreecommitdiff
path: root/testing/toxic
diff options
context:
space:
mode:
Diffstat (limited to 'testing/toxic')
-rw-r--r--testing/toxic/main.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index f2a3560c..e4165257 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -40,7 +40,7 @@ void setdir()
40{ 40{
41#ifdef WIN32 41#ifdef WIN32
42 strcpy(dir, "%appdata%/.tox/"); 42 strcpy(dir, "%appdata%/.tox/");
43#elif __APPLE__ 43#elif defined(__APPLE__)
44 strcpy(dir, "~/Library/Application Support/.tox/"); 44 strcpy(dir, "~/Library/Application Support/.tox/");
45#elif defined(linux) 45#elif defined(linux)
46 strcpy(dir, "~/.tox/"); 46 strcpy(dir, "~/.tox/");
@@ -88,7 +88,7 @@ static Messenger *init_tox()
88 setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); 88 setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
89#elif defined(WIN32) 89#elif defined(WIN32)
90 setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); 90 setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
91#elif __APPLE__ 91#elif defined(__APPLE__)
92 setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters 92 setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters
93#else 93#else
94 setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); 94 setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4"));
@@ -108,7 +108,7 @@ int init_connection(void)
108 108
109#if WIN32 109#if WIN32
110 FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); 110 FILE *fp = fopen("%appdata%/.tox/DHTservers", "r");
111#elif __APPLE__ 111#elif defined(__APPLE__)
112 FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); 112 FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r");
113#else 113#else
114 FILE *fp = fopen("~/.tox/DHTservers", "r"); 114 FILE *fp = fopen("~/.tox/DHTservers", "r");
@@ -314,8 +314,7 @@ int main(int argc, char *argv[])
314 DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); 314 DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
315 strcpy(DATA_FILE, user_config_dir); 315 strcpy(DATA_FILE, user_config_dir);
316 strcat(DATA_FILE, CONFIGDIR); 316 strcat(DATA_FILE, CONFIGDIR);
317 strcat(DATA_FILE, dir); 317 strcat(DATA_FILE, "data");
318 DATA_FILE = strdup("data");
319 } 318 }
320 } 319 }
321 320