X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=a24c636626835a841ed8e67e4f5bf482b3c61a37;hb=ca30742ed33315bdd0620d7a6ef417ab7405a0ba;hp=6d23b80e2e33acd3530ef0c74f2281d30a2f1b33;hpb=bcc60f94fc788d774205bcf824b655ae2fb4e6fc;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 6d23b80..a24c636 100644
--- 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,7 +229,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	bool ret;
 	struct psensor *s;
-	double d, high_temp;
+	double high_temp;
 
 	high_temp = config_get_default_high_threshold_temperature();
 
@@ -417,6 +417,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);
@@ -533,6 +535,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();