projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed useless local var and code
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
a1af9bc
..
55209df
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-191,16
+191,14
@@
static gboolean ui_refresh_thread(gpointer data)
pmutex_lock(&ui->sensors_mutex);
pmutex_lock(&ui->sensors_mutex);
- graph_update(ui->sensors, ui
->w_graph
, ui->config, ui->main_window);
+ graph_update(ui->sensors, ui
_get_graph()
, ui->config, ui->main_window);
ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
- ui_unity_launcher_entry_update(ui->sensors,
- !cfg->unity_launcher_count_disabled,
- cfg->temperature_unit == CELSIUS);
+ ui_unity_launcher_entry_update(ui->sensors);
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;
@@
-227,11
+225,14
@@
static void cb_alarm_raised(struct psensor *sensor, void *data)
static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
- struct psensor **sensor_cur = sensors;
bool ret;
bool ret;
+ struct psensor *s;
+ double d, high_temp;
- while (*sensor_cur) {
- struct psensor *s = *sensor_cur;
+ high_temp = config_get_default_high_threshold_temperature();
+
+ while (*sensors) {
+ s = *sensors;
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
@@
-239,8
+240,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);
@@
-248,7
+255,7
@@
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
if (!ret && s->min != UNKNOWN_DBL_VALUE)
s->alarm_low_threshold = s->min;
if (!ret && s->min != UNKNOWN_DBL_VALUE)
s->alarm_low_threshold = s->min;
- sensor
_cur
++;
+ sensor
s
++;
}
}
}
}
@@
-524,6
+531,7
@@
int main(int argc, char **argv)
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
ui_appindicator_init(&ui);
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
ui_appindicator_init(&ui);
+ ui_unity_init();
gdk_notify_startup_complete();
gdk_notify_startup_complete();