projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made the setting temperature unit dynamic
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
dce4573
..
484addd
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-185,6
+185,7
@@
static gboolean ui_refresh_thread(gpointer data)
struct config *cfg;
gboolean ret;
struct ui_psensor *ui = (struct ui_psensor *)data;
struct config *cfg;
gboolean ret;
struct ui_psensor *ui = (struct ui_psensor *)data;
+ int use_celsius;
ret = TRUE;
cfg = ui->config;
ret = TRUE;
cfg = ui->config;
@@
-198,9
+199,13
@@
static gboolean ui_refresh_thread(gpointer data)
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
+ if (config_get_temperature_unit() == CELSIUS)
+ use_celsius = 1;
+ else
+ use_celsius = 0;
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
-
cfg->temperature_unit == CELSIUS
);
+
use_celsius
);
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
@@
-229,6
+234,9
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
bool ret;
struct psensor *s;
{
bool ret;
struct psensor *s;
+ double d, high_temp;
+
+ high_temp = config_get_default_high_threshold_temperature();
while (*sensors) {
s = *sensors;
while (*sensors) {
s = *sensors;
@@
-239,8
+247,14
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
ret = config_get_sensor_alarm_high_threshold
(s->id, &s->alarm_high_threshold);
ret = config_get_sensor_alarm_high_threshold
(s->id, &s->alarm_high_threshold);
- if (!ret && s->max != UNKNOWN_DBL_VALUE)
- s->alarm_high_threshold = s->max;
+ if (!ret) {
+ if (s->max == UNKNOWN_DBL_VALUE) {
+ if (s->type & SENSOR_TYPE_TEMP)
+ s->alarm_high_threshold = high_temp;
+ } else {
+ s->alarm_high_threshold = s->max;
+ }
+ }
ret = config_get_sensor_alarm_low_threshold
(s->id, &s->alarm_low_threshold);
ret = config_get_sensor_alarm_low_threshold
(s->id, &s->alarm_low_threshold);