From 412f5e66052f7edb3d96efcf9ca4747bd740304f Mon Sep 17 00:00:00 2001 From: mmdolze Date: Sat, 4 May 2013 14:45:28 +0000 Subject: [PATCH] Changed my mind: Turn off the heartbeat icon on the OldTime screen unconditionally if title is turned off. --- ChangeLog | 2 +- clients/lcdproc/chrono.c | 4 +--- clients/lcdproc/lcdproc.conf | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68e662b..1c08a48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,7 @@ v0.5dev (ongoing development) * Build system: Rename configure.in to configure.ac + hd44780: Add support for FreeBSD's iic I2C framework + hd44780: New connection type 'piplate' (J. Brogdon) - * lcdproc client: Add option to turn off title and heartbeat on OldTime screen + * lcdproc client: Add option to turn off title on OldTime screen + glcd driver: Connection type 'x11' that draws to a X window (S. Meharg) v0.5.6 diff --git a/clients/lcdproc/chrono.c b/clients/lcdproc/chrono.c index 02f36fa..39f7160 100644 --- a/clients/lcdproc/chrono.c +++ b/clients/lcdproc/chrono.c @@ -203,7 +203,6 @@ clock_screen(int rep, int display, int *flags_ptr) if ((*flags_ptr & INITIALIZED) == 0) { char tmp[257]; /* should be large enough for host name */ - int disableHeart; /* Disables server heartbeat icon */ *flags_ptr |= INITIALIZED; @@ -211,11 +210,10 @@ clock_screen(int rep, int display, int *flags_ptr) timeFormat = config_get_string("OldTime", "TimeFormat", 0, "%H:%M:%S"); dateFormat = config_get_string("OldTime", "DateFormat", 0, "%b %d %Y"); showTitle = config_get_bool("OldTime", "ShowTitle", 0, 1); - disableHeart = config_get_bool("OldTime", "DisableHeartbeat", 0, 0); sock_send_string(sock, "screen_add O\n"); sock_printf(sock, "screen_set O -name {Old Clock Screen: %s}\n", get_hostname()); - if (disableHeart) + if (!showTitle) sock_send_string(sock, "screen_set O -heartbeat off\n"); sock_send_string(sock, "widget_add O one string\n"); if (lcd_hgt >= 4) { diff --git a/clients/lcdproc/lcdproc.conf b/clients/lcdproc/lcdproc.conf index 5d5643b..f0efe35 100644 --- a/clients/lcdproc/lcdproc.conf +++ b/clients/lcdproc/lcdproc.conf @@ -106,9 +106,6 @@ DateFormat="%x" # Display the title bar in two-line mode. Note that with four lines or more # the title is always shown. [default: true; legal: true, false] #ShowTitle=false -# Disables the heartbeat icon in the top right corner. By default, the server -# setting for the heartbeat is used. [default: false; legal: true, false] -#DisableHeartbeat=true [BigClock]