X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=defc60d80e7981d22815e88a5afd895b917f3021;hb=30280f0093e8aea4bc8af8a46c2e529e8ec61ac9;hp=a1af9bc77f50ee388a7cf06b85bfc2202ccc8fc2;hpb=912b5d1986633786a656bb3361f7ae9c1263acef;p=psensor.git

diff --git a/src/main.c b/src/main.c
index a1af9bc..defc60d 100644
--- 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;
+	int use_celsius;
 
 	ret = TRUE;
 	cfg = ui->config;
@@ -198,9 +199,11 @@ static gboolean ui_refresh_thread(gpointer data)
 	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);
+	if (config_get_temperature_unit() == CELSIUS)
+		use_celsius = 1;
+	else
+		use_celsius = 0;
+	ui_unity_launcher_entry_update(ui->sensors);
 
 	if (ui->graph_update_interval != cfg->graph_update_interval) {
 		ui->graph_update_interval = cfg->graph_update_interval;
@@ -227,11 +230,14 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
 static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
-	struct psensor **sensor_cur = sensors;
 	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;
@@ -239,8 +245,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);
 
-		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);
@@ -248,7 +260,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;
 
-		sensor_cur++;
+		sensors++;
 	}
 }
 
@@ -524,6 +536,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();