Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 12:36:45 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core

Browse Source 
Conflicts:
	core/Messenger.c
	core/Messenger.h
This commit is contained in:
Maxim Biro
2013-08-07 19:18:40 -04:00
parent 174604a448 8e881ca50f
commit 90acd2dfef
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main.c
View File

@ -22,6 +22,7 @@ extern int add_req(uint8_t *public_key); // XXX
/* Holds status of chat windows */
char WINDOW_STATUS[MAX_WINDOW_SLOTS];
#define TOXICVER "0.1.0" //Will be moved to a -D flag later
static ToxWindow windows[MAX_WINDOW_SLOTS];
static ToxWindow* prompt;
@ -258,7 +259,7 @@ static void draw_bar()
move(LINES - 1, 0);
attron(COLOR_PAIR(4) | A_BOLD);
printw(" TOXIC 1.0 |");
printw(" TOXIC " TOXICVER " |");
attroff(COLOR_PAIR(4) | A_BOLD);
int i;