SoniEx2
/
c.sexchat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't abort if translated text event fails 

At least try the untranslated one...

Also while at it don't present a ton of dialogs to the user
about this failure, they wouldn't even know what to do with
that information.
This commit is contained in:
Patrick Griffis 2016-10-10 14:08:47 -04:00
parent bb8f0beabe
commit 2a81b98e7b
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/text.c
View File

@ -1517,27 +1517,38 @@ void
pevent_make_pntevts (void) pevent_make_pntevts (void)
{ {
int i, m; int i, m;
char out[1024];
for (i = 0; i < NUM_XP; i++) for (i = 0; i < NUM_XP; i++)
{ {
g_free (pntevts[i]); g_free (pntevts[i]);
if (pevt_build_string (pntevts_text[i], &(pntevts[i]), &m) != 0) if (pevt_build_string (pntevts_text[i], &(pntevts[i]), &m) != 0)
{ {
g_snprintf (out, sizeof (out),
_("Error parsing event %s.\nLoading default."), te[i].name);
fe_message (out, FE_MSG_WARN);
g_free (pntevts_text[i]);
/* make-te.c sets this 128 flag (DON'T call gettext() flag) */ /* make-te.c sets this 128 flag (DON'T call gettext() flag) */
if (te[i].num_args & 128) const gboolean translate = !(te[i].num_args & 128);
pntevts_text[i] = g_strdup (te[i].def);
else g_warning ("Error parsing event %s\nLoading default.", te[i].name);
g_free (pntevts_text[i]);
if (translate)
pntevts_text[i] = g_strdup (_(te[i].def)); pntevts_text[i] = g_strdup (_(te[i].def));
else
pntevts_text[i] = g_strdup (te[i].def);
if (pevt_build_string (pntevts_text[i], &(pntevts[i]), &m) != 0 && !translate)
{
g_error ("HexChat CRITICAL *** default event text failed to build!");
}
else
{
g_warning ("Error parsing translated event %s\nLoading untranslated.", te[i].name);
g_free (pntevts_text[i]);
pntevts_text[i] = g_strdup (te[i].def);
if (pevt_build_string (pntevts_text[i], &(pntevts[i]), &m) != 0) if (pevt_build_string (pntevts_text[i], &(pntevts[i]), &m) != 0)
{ {
fprintf (stderr, g_error ("HexChat CRITICAL *** default event text failed to build!");
"HexChat CRITICAL *** default event text failed to build!\n"); }
abort ();
} }
} }
} }