add missing battery config CPP guard

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

diff --git a/src/clock/clock.c b/src/clock/clock.c
index 38cfcde00a24aed84fad0479ffe90a2f2a688b2f..6212dc12dde23407ed8ddc8035c960000adf5684 100644 (file)
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -130,8 +130,9 @@ const char* clock_get_tooltip(void* obj)
 
 void init_clock()
 {
-       if(time1_format && clock_timeout==0) {
-               if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r'))
+       if((time1_format || time2_format) && clock_timeout==0) {
+               if (strchr(time1_format, 'S') || strchr(time1_format, 'T') || strchr(time1_format, 'r') ||
+                   strchr(time2_format, 'S') || strchr(time2_format, 'T') || strchr(time2_format, 'r'))
                        clock_timeout = add_timeout(10, 1000, update_clocks_sec, 0);
                else
                        clock_timeout = add_timeout(10, 1000, update_clocks_min, 0);
@@ -143,7 +144,9 @@ void init_clock_panel(void *p)
 {
        Panel *panel =(Panel*)p;
        Clock *clock = &panel->clock;
-
+       
+       if (clock->area.bg == 0)
+               clock->area.bg = &g_array_index(backgrounds, Background, 0);
        clock->area.parent = p;
        clock->area.panel = p;
        clock->area._draw_foreground = draw_clock;
@@ -221,8 +224,8 @@ int resize_clock (void *obj)
                        clock->area.width = new_size + 1;
                        clock->time1_posy = (clock->area.height - time_height) / 2;
                        if (time2_format) {
-                               clock->time1_posy -= ((date_height_ink + 2) / 2);
-                               clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+                               clock->time1_posy -= (date_height)/2;
+                               clock->time2_posy = clock->time1_posy + time_height;
                        }
                        ret = 1;
                }
@@ -234,8 +237,8 @@ int resize_clock (void *obj)
                        clock->area.height =  new_size;
                        clock->time1_posy = (clock->area.height - time_height) / 2;
                        if (time2_format) {
-                               clock->time1_posy -= ((date_height_ink + 2) / 2);
-                               clock->time2_posy = clock->time1_posy + time_height + 2 - (time_height - time_height_ink)/2 - (date_height - date_height_ink)/2;
+                               clock->time1_posy -= (date_height)/2;
+                               clock->time2_posy = clock->time1_posy + time_height;
                        }
                        ret = 1;
                }