AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

calendar: Use the new "%OB" format if supported

Browse Source 
Due to the recent changes introduced in glibc 2.27 "%OB" is the
correct format to obtain a month name as used in the calendar
header.  The same rule has been working in BSD family (including
OS X) since 1990s.  This simple hack checks whether "%OB" is supported
at runtime and uses it if it is, falls back to the old "%B" otherwise.

Closes: #9
This commit is contained in:
Rafal Luzynski 2018-02-10 14:07:56 +01:00
parent 4b1c02560f
commit cbf118c285
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gtk/gtkcalendar.c
View File

@ -694,6 +694,7 @@ gtk_calendar_init (GtkCalendar *calendar)
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
wchar_t wbuffer[100]; wchar_t wbuffer[100];
#else #else
static const char *month_format = NULL;
char buffer[255]; char buffer[255];
time_t tmp_time; time_t tmp_time;
#endif #endif
@ -718,7 +719,7 @@ gtk_calendar_init (GtkCalendar *calendar)
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
tmp_time= (i+3)*86400; tmp_time= (i+3)*86400;
strftime ( buffer, sizeof (buffer), "%a", gmtime (&tmp_time)); strftime (buffer, sizeof (buffer), "%a", gmtime (&tmp_time));
default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL); default_abbreviated_dayname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else #else
if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7, if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SABBREVDAYNAME1 + (i+6)%7,
@ -734,7 +735,21 @@ gtk_calendar_init (GtkCalendar *calendar)
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
tmp_time=i*2764800; tmp_time=i*2764800;
strftime ( buffer, sizeof (buffer), "%B", gmtime (&tmp_time)); if (G_UNLIKELY (month_format == NULL))
{
buffer[0] = '\0';
month_format = "%OB";
strftime (buffer, sizeof (buffer), month_format, gmtime (&tmp_time));
/* "%OB" is not supported in Linux with glibc < 2.27 */
if (!strcmp (buffer, "%OB") || !strcmp (buffer, "OB") || !strcmp (buffer, ""))
{
month_format = "%B";
strftime (buffer, sizeof (buffer), month_format, gmtime (&tmp_time));
}
}
else
strftime (buffer, sizeof (buffer), month_format, gmtime (&tmp_time));
default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL); default_monthname[i] = g_locale_to_utf8 (buffer, -1, NULL, NULL, NULL);
#else #else
if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i, if (!GetLocaleInfoW (GetThreadLocale (), LOCALE_SMONTHNAME1 + i,