X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=09dd18cf3f0b0a0dc6d81718d27e580a547f9d75;hb=1c7503e149474b932227ada44ca82df07be2d696;hp=dce457346015c55b6691af0d54ba279559f55a50;hpb=ff659df2cbe866aa79243d60a7d6d01df8df4ec3;p=psensor.git

diff --git a/src/main.c b/src/main.c
index dce4573..09dd18c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -191,16 +191,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 +227,9 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	bool ret;
 	struct psensor *s;
+	double high_temp;
+
+	high_temp = config_get_default_high_threshold_temperature();
 
 	while (*sensors) {
 		s = *sensors;
@@ -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);
 
-		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);
@@ -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);
+	ui_unity_init();
 
 	gdk_notify_startup_complete();