moparisthebest/hexchat
1
0
Fork 0
mirror of https://github.com/moparisthebest/hexchat synced 2024-11-29 20:52:16 -05:00
Code Issues Releases Wiki Activity

fix for time stamp format crashes

Browse Source
This commit is contained in:
Berke Viktor 2012-02-16 17:21:15 +01:00
parent fc3d4d31f0
commit 0ac0510be0
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/text.c
View File

@ -686,6 +686,13 @@ get_stamp_str (char *fmt, time_t tim, char **ret)
} }
len = strftime (dest, sizeof (dest), fmt, localtime (&tim)); len = strftime (dest, sizeof (dest), fmt, localtime (&tim));
#ifdef WIN32
if (!len)
{
/* use failsafe format until a correct one is specified */
len = strftime (dest, sizeof (dest), "[%H:%M]", localtime (&tim));
}
#endif
if (len) if (len)
{ {
if (prefs.utf8_locale) if (prefs.utf8_locale)

17
src/fe-gtk/setup.c
View File

@ -455,7 +455,11 @@ static const setting logging_settings[] =
{ST_HEADER, N_("Time Stamps"),0,0,0}, {ST_HEADER, N_("Time Stamps"),0,0,0},
{ST_TOGGLE, N_("Insert timestamps in logs"), P_OFFINTNL(timestamp_logs), 0, 0, 2}, {ST_TOGGLE, N_("Insert timestamps in logs"), P_OFFINTNL(timestamp_logs), 0, 0, 2},
{ST_ENTRY, N_("Log timestamp format:"), P_OFFSETNL(timestamp_log_format), 0, 0, sizeof prefs.timestamp_log_format}, {ST_ENTRY, N_("Log timestamp format:"), P_OFFSETNL(timestamp_log_format), 0, 0, sizeof prefs.timestamp_log_format},
{ST_LABEL, N_("See strftime manpage for details.")}, #ifdef WIN32
{ST_LABEL, N_("See the strftime MSDN article for details.")},
#else
{ST_LABEL, N_("See the strftime manpage for details.")},
#endif
{ST_END, 0, 0, 0, 0, 0} {ST_END, 0, 0, 0, 0, 0}
}; };
@ -2065,6 +2069,7 @@ setup_apply (struct xchatprefs *pr)
PangoFontDescription *old_desc; PangoFontDescription *old_desc;
PangoFontDescription *new_desc; PangoFontDescription *new_desc;
char buffer[4 * FONTNAMELEN + 1]; char buffer[4 * FONTNAMELEN + 1];
time_t rawtime;
#endif #endif
int new_pix = FALSE; int new_pix = FALSE;
int noapply = FALSE; int noapply = FALSE;
@ -2109,7 +2114,8 @@ setup_apply (struct xchatprefs *pr)
memcpy (&prefs, pr, sizeof (prefs)); memcpy (&prefs, pr, sizeof (prefs));
#ifdef WIN32 /* merge font_main and font_alternative into font_normal */ #ifdef WIN32
/* merge font_main and font_alternative into font_normal */
old_desc = pango_font_description_from_string (prefs.font_main); old_desc = pango_font_description_from_string (prefs.font_main);
sprintf (buffer, "%s,%s", pango_font_description_get_family (old_desc), prefs.font_alternative); sprintf (buffer, "%s,%s", pango_font_description_get_family (old_desc), prefs.font_alternative);
new_desc = pango_font_description_from_string (buffer); new_desc = pango_font_description_from_string (buffer);
@ -2122,6 +2128,13 @@ setup_apply (struct xchatprefs *pr)
g_free (old_desc); g_free (old_desc);
g_free (new_desc); g_free (new_desc);
*/ */
/* workaround for strftime differences between POSIX and MSVC */
time (&rawtime);
if(!strftime (buffer, sizeof (buffer), prefs.stamp_format, localtime (&rawtime)) || !strftime (buffer, sizeof (buffer), prefs.timestamp_log_format, localtime (&rawtime)))
{
fe_message (_("Invalid time stamp format! See the strftime MSDN article for details."), FE_MSG_ERROR);
}
#endif #endif
setup_apply_real (new_pix, do_ulist, do_layout); setup_apply_real (new_pix, do_ulist, do_layout);