Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 03:03:02 +01:00
Code Issues Projects Releases Wiki Activity

Fixed toxic not running

Browse Source
This commit is contained in:
Sean Qureshi 2013-08-18 05:34:50 -07:00
parent 4fe94ca403
commit 3c77156d6d
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
main.c
View File

@ -27,6 +27,7 @@
/* Export for use in Callbacks */ /* Export for use in Callbacks */
char *DATA_FILE = NULL; char *DATA_FILE = NULL;
char dir[31];
void on_window_resize(int sig) void on_window_resize(int sig)
{ {
@ -35,6 +36,17 @@ void on_window_resize(int sig)
clear(); clear();
} }
void setdir()
{
#ifdef WIN32
strcpy(dir, "%appdata%/.tox/");
#elif defined(MAC_OSX)
strcpy(dir, "~/Library/Application Support/.tox/");
#elif defined(linux)
strcpy(dir, "~/.tox/");
#endif
}
static void init_term() static void init_term()
{ {
/* Setup terminal */ /* Setup terminal */
@ -72,15 +84,15 @@ static Messenger *init_tox()
m_callback_namechange(m, on_nickchange, NULL); m_callback_namechange(m, on_nickchange, NULL);
m_callback_statusmessage(m, on_statuschange, NULL); m_callback_statusmessage(m, on_statuschange, NULL);
m_callback_action(m, on_action, NULL); m_callback_action(m, on_action, NULL);
#ifdef __linux__ #ifdef __linux__
setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy")); setname(m, (uint8_t *) "Cool guy", sizeof("Cool guy"));
#elif win32 #elif defined(WIN32)
setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux")); setname(m, (uint8_t *) "I should install GNU/Linux", sizeof("I should install GNU/Linux"));
#elif MAC_OSX #elif defined(MAC_OSX)
setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters setname(m, (uint8_t *) "Hipster", sizeof("Hipster")); //This used to users of other Unixes are hipsters
#else #else
setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4")); setname(m, (uint8_t *) "Registered Minix user #4", sizeof("Registered Minix user #4"));
#endif #endif
return m; return m;
} }
@ -94,13 +106,13 @@ int init_connection(void)
if (DHT_isconnected()) if (DHT_isconnected())
return 0; return 0;
#if win32 #if WIN32
FILE *fp = fopen("%appdata%/.tox/DHTservers", "r"); FILE *fp = fopen("%appdata%/.tox/DHTservers", "r");
#elif MAC_OSX #elif MAC_OSX
FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r"); FILE *fp = fopen("~/Library/Application Support/.tox/DHTservers", "r");
#else #else
FILE *fp = fopen("~/.tox/DHTservers", "r"); FILE *fp = fopen("~/.tox/DHTservers", "r");
#endif #endif
if (!fp) if (!fp)
return 1; return 1;
@ -267,6 +279,7 @@ static void load_data(Messenger *m, char *path)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
setdir();
char *user_config_dir = get_user_config_dir(); char *user_config_dir = get_user_config_dir();
int config_err = 0; int config_err = 0;
@ -293,24 +306,16 @@ int main(int argc, char *argv[])
config_err = create_user_config_dir(user_config_dir); config_err = create_user_config_dir(user_config_dir);
if (config_err) { if (config_err) {
#if WIN32 strcat(DATA_FILE, dir);
DATA_FILE = strdup("%appdata/.tox/data"); DATA_FILE = strdup("data");
#elif MAC_OSX
DATA_FILE = strdup("~Library/Application Support/data");
#else
DATA_FILE = strdup("~/.tox/data");
#endif
} else { } else {
DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1); DATA_FILE = malloc(strlen(user_config_dir) + strlen(CONFIGDIR) + strlen("data") + 1);
strcpy(DATA_FILE, user_config_dir); strcpy(DATA_FILE, user_config_dir);
strcat(DATA_FILE, CONFIGDIR); strcat(DATA_FILE, CONFIGDIR);
#if WIN32 strcat(DATA_FILE, dir);
DATA_FILE = strdup("%appdata/.tox/data"); DATA_FILE = strdup("data");
#elif MAC_OSX
DATA_FILE = strdup("~Library/Application Support/data");
#else
DATA_FILE = strdup("~/.tox/data");
#endif
} }
} }