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

Revert commit 312d0c3 (localization/gettext)

Browse Source 
There were serious problems with branch merging that need to be resolved first
This commit is contained in:
Jfreegman
2015-07-04 01:19:16 -04:00
parent 444d8e7a74
commit 035420e5c7
37 changed files with 441 additions and 5552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/windows.c
View File

@ -25,12 +25,6 @@
#include <pthread.h>
#include <ctype.h>
#ifdef NO_GETTEXT
#define gettext(A) (A)
#else
#include <libintl.h>
#endif
#include "friendlist.h"
#include "prompt.h"
#include "toxic.h"
@ -365,7 +359,7 @@ void set_next_window(int ch)
return;
if (active_window == inf) /* infinite loop check */
exit_toxic_err(gettext("failed in set_next_window"), FATALERR_INFLOOP);
exit_toxic_err("failed in set_next_window", FATALERR_INFLOOP);
}
}
@ -387,7 +381,7 @@ ToxWindow *init_windows(Tox *m)
int n_prompt = add_window(m, new_prompt());
if (n_prompt == -1 || add_window(m, new_friendlist()) == -1)
exit_toxic_err(gettext("failed in init_windows"), FATALERR_WININIT);
exit_toxic_err("failed in init_windows", FATALERR_WININIT);
prompt = &windows[n_prompt];
active_window = prompt;