nilix/tint2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Remove static clock tooltip buffer" (g_date_time_format uses format strings slightly different from strftime)

Browse source 
This reverts commit 441c420773.
This commit is contained in:
o9000 2015-08-07 07:54:13 +02:00
parent 8528a6a4a4
commit cf748d6d41
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/clock/clock.c
View file

@ -48,6 +48,7 @@ PangoFontDescription *time1_font_desc;
PangoFontDescription *time2_font_desc; PangoFontDescription *time2_font_desc;
static char buf_time[256]; static char buf_time[256];
static char buf_date[256]; static char buf_date[256];
static char buf_tooltip[512];
int clock_enabled; int clock_enabled;
static timeout* clock_timeout; static timeout* clock_timeout;
@ -145,13 +146,8 @@ struct tm* clock_gettime_for_tz(const char* timezone) {
char* clock_get_tooltip(void* obj) char* clock_get_tooltip(void* obj)
{ {
GTimeZone *tz = g_time_zone_new(time_tooltip_timezone); strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
GDateTime *now = g_date_time_new_now(tz); return strdup(buf_tooltip);
char *result = g_date_time_format(now, time_tooltip_format);
g_date_time_unref(now);
g_time_zone_unref(tz);
return result;
} }
int time_format_needs_sec_ticks(char *time_format) int time_format_needs_sec_ticks(char *time_format)
@ -201,6 +197,7 @@ void init_clock_panel(void *p)
if (time_tooltip_format) { if (time_tooltip_format) {
clock->area._get_tooltip_text = clock_get_tooltip; clock->area._get_tooltip_text = clock_get_tooltip;
strftime(buf_tooltip, sizeof(buf_tooltip), time_tooltip_format, clock_gettime_for_tz(time_tooltip_timezone));
} }
} }