*fix* valgrind invalid read/write and memleaks

[chaz/tint2] / src / clock / clock.c

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 55e5e456285b59b019dc8f9d4460a22c3e2c05e5..500cfa3ba8556f82a8e30ac0afe688caa861c5b2 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -78,6 +78,7 @@ void cleanup_clock()
        if (time_tooltip_timezone) g_free(time_tooltip_timezone);
        if (clock_lclick_command) g_free(clock_lclick_command);
        if (clock_rclick_command) g_free(clock_rclick_command);
+       if (clock_timeout) stop_timeout(clock_timeout);
 }
 
 
@@ -148,12 +149,11 @@ void init_clock_panel(void *p)
        clock->area._draw_foreground = draw_clock;
        clock->area.size_mode = SIZE_BY_CONTENT;
        clock->area._resize = resize_clock;
-       clock->area.resize = 1;
-       clock->area.redraw = 1;
        // check consistency
        if (time1_format == 0)
                return;
 
+       clock->area.resize = 1;
        clock->area.on_screen = 1;
 
        if (time_tooltip_format) {
@@ -205,13 +205,14 @@ int resize_clock (void *obj)
 
        clock->area.redraw = 1;
        
+       date_height = date_width = 0;
        strftime(buf_time, sizeof(buf_time), time1_format, clock_gettime_for_tz(time1_timezone));
        get_text_size2(time1_font_desc, &time_height_ink, &time_height, &time_width, panel->area.height, panel->area.width, buf_time, strlen(buf_time));
        if (time2_format) {
                strftime(buf_date, sizeof(buf_date), time2_format, clock_gettime_for_tz(time2_timezone));
                get_text_size2(time2_font_desc, &date_height_ink, &date_height, &date_width, panel->area.height, panel->area.width, buf_date, strlen(buf_date));
        }
-       
+
        if (panel_horizontal) {
                int new_size = (time_width > date_width) ? time_width : date_width;
                new_size += (2*clock->area.paddingxlr) + (2*clock->area.bg->border.width);