1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-10 09:46:45 +02:00

Merge branch 'TsarFox-master'

This commit is contained in:
jfreegman
2017-05-24 14:57:32 -04:00
33 changed files with 1170 additions and 14 deletions

View File

@ -75,6 +75,11 @@
ToxAV *av;
#endif /* AUDIO */
#ifdef PYTHON
#include "api.h"
#include "python_api.h"
#endif
#ifndef PACKAGE_DATADIR
#define PACKAGE_DATADIR "."
#endif
@ -169,6 +174,10 @@ void exit_toxic_success(Tox *m)
terminate_audio();
#endif /* AUDIO */
#ifdef PYTHON
terminate_python();
#endif /* PYTHON */
free_global_data();
tox_kill(m);
endwin();
@ -1218,6 +1227,13 @@ int main(int argc, char **argv)
#endif /* AUDIO */
#ifdef PYTHON
init_python(m);
invoke_autoruns(prompt->chatwin->history, prompt);
#endif /* PYTHON */
init_notify(60, 3000);
/* screen/tmux auto-away timer */