X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fclock%2Fclock.c;h=92378610414cfa3d293f7b0ea4aa6eb7091b3be7;hb=ce3940e57a3f92d2179263a4c734748d81d6e75f;hp=55e5e456285b59b019dc8f9d4460a22c3e2c05e5;hpb=bbec33ce1a15b555a737f2fefe7bdfb6a8881705;p=chaz%2Ftint2

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 55e5e45..9237861 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -2,7 +2,7 @@
 *
 * Tint2 : clock
 *
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -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);