Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2025-07-03 12:16:44 +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

12
src/log.c
View File

@ -25,12 +25,6 @@
#include <time.h>
#include <sys/stat.h>
#ifdef NO_GETTEXT
#define gettext(A) (A)
#else
#include <libintl.h>
#endif
#include "configdir.h"
#include "toxic.h"
#include "windows.h"
@ -186,17 +180,17 @@ void load_chat_history(ToxWindow *self, struct chatlog *log)
char *hstbuf = malloc(sz);
if (hstbuf == NULL)
exit_toxic_err(gettext("failed in load_chat_history"), FATALERR_MEMORY);
exit_toxic_err("failed in load_chat_history", FATALERR_MEMORY);
if (fseek(log->file, 0L, SEEK_SET) == -1) {
free(hstbuf);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, gettext(" * Failed to read log file"));
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to read log file");
return;
}
if (fread(hstbuf, sz, 1, log->file) != 1) {
free(hstbuf);
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, gettext(" * Failed to read log file"));
line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, RED, " * Failed to read log file");
return;
}