Fixed: Fresh install of 1.2.0 complains about missing sensor config keys. (LP :#1650378)

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index dce4573..2868142 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2017 jeanfi@gmail.com
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -31,6 +31,7 @@
 #include <config.h>
 
 #include <amd.h>
+#include <bcm2835.h>
 #include <cfg.h>
 #include <graph.h>
 #include <hdd.h>
@@ -144,6 +145,7 @@ static void *update_measures(void *data)
                gtop2_psensor_list_update(sensors);
                atasmart_psensor_list_update(sensors);
                hddtemp_psensor_list_update(sensors);
+               bcm2835_psensor_list_update(sensors);
 
                psensor_log_measures(sensors);
 
@@ -191,16 +193,14 @@ static gboolean ui_refresh_thread(gpointer data)
 
        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_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;
@@ -229,6 +229,9 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
        bool ret;
        struct psensor *s;
+       double high_temp, high_default, low_default;
+
+       high_temp = config_get_default_high_threshold_temperature();
 
        while (*sensors) {
                s = *sensors;
@@ -236,17 +239,31 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
                s->cb_alarm_raised = cb_alarm_raised;
                s->cb_alarm_raised_data = ui;
 
+               if (s->max == UNKNOWN_DBL_VALUE) {
+                       if (s->type & SENSOR_TYPE_TEMP)
+                               high_default = high_temp;
+                       else
+                               high_default = UNKNOWN_DBL_VALUE;
+               } else {
+                       high_default = s->max;
+               }
+
                ret = config_get_sensor_alarm_high_threshold
-                       (s->id, &s->alarm_high_threshold);
+                       (s->id, &s->alarm_high_threshold, high_default);
+
+               if (!ret)
+                       s->alarm_high_threshold = high_default;
 
-               if (!ret && s->max != UNKNOWN_DBL_VALUE)
-                       s->alarm_high_threshold = s->max;
+               if (s->min == UNKNOWN_DBL_VALUE)
+                       low_default = 0;
+               else
+                       low_default = s->min;
 
                ret = config_get_sensor_alarm_low_threshold
-                       (s->id, &s->alarm_low_threshold);
+                       (s->id, &s->alarm_low_threshold, low_default);
 
-               if (!ret && s->min != UNKNOWN_DBL_VALUE)
-                       s->alarm_low_threshold = s->min;
+               if (!ret)
+                       s->alarm_low_threshold = low_default;
 
                sensors++;
        }
@@ -408,6 +425,8 @@ static struct psensor **create_sensors_list(const char *url)
 
                if (config_is_udisks2_enabled())
                        udisks2_psensor_list_append(&sensors, 600);
+
+               bcm2835_psensor_list_append(&sensors, 600);
        }
 
        associate_preferences(sensors);
@@ -524,6 +543,7 @@ int main(int argc, char **argv)
        g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
 
        ui_appindicator_init(&ui);
+       ui_unity_init();
 
        gdk_notify_startup_complete();