X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=65549fbebd2081ac3ab10b3a9d889421e2d288d4;hb=15d844f17741d30f4f1bc3154c6d74c9a6c5a3b2;hp=811893cf5ae0402b786dec10e834403a3b3ec6dc;hpb=ef58c80b895ef11c611e1865cb5ceeff9ce096d5;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 811893c..65549fb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -39,6 +39,7 @@
 #include "lmsensor.h"
 #include "notify_cmd.h"
 #include <pmutex.h>
+#include <pudisks2.h>
 #include "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
@@ -165,6 +166,9 @@ static void *update_measures(void *data)
 #ifdef HAVE_LIBATIADL
 		amd_psensor_list_update(sensors);
 #endif
+#ifdef HAVE_LIBUDISKS2
+		udisks2_psensor_list_update(sensors);
+#endif
 
 		psensor_log_measures(sensors);
 
@@ -254,16 +258,16 @@ static void associate_colors(struct psensor **sensors)
 	/* number of uniq colors */
 #define COLORS_COUNT 8
 
-	unsigned int colors[COLORS_COUNT][3] = {
-		{0x0000, 0x0000, 0x0000},	/* black */
-		{0xffff, 0x0000, 0x0000},	/* red */
-		{0x0000, 0x0000, 0xffff},	/* blue */
-		{0x0000, 0xffff, 0x0000},	/* green */
+	double colors[COLORS_COUNT][3] = {
+		{0, 0, 0},	/* black */
+		{1, 0, 0},	/* red */
+		{0, 0, 1},	/* blue */
+		{0, 1, 0},	/* green */
 
-		{0x7fff, 0x7fff, 0x7fff},	/* grey */
-		{0x7fff, 0x0000, 0x0000},	/* dark red */
-		{0x0000, 0x0000, 0x7fff},	/* dark blue */
-		{0x0000, 0x7fff, 0x0000}	/* dark green */
+		{0.5, 0.5, 0.5},/* grey */
+		{0.5, 0, 0},	/* dark red */
+		{0, 0, 0.5},	/* dark blue */
+		{0, 0.5, 0}	/* dark green */
 	};
 	struct psensor **cur;
 	int i;
@@ -283,6 +287,7 @@ static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	struct psensor **sensor_cur = sensors;
+
 	while (*sensor_cur) {
 		struct psensor *s = *sensor_cur;
 
@@ -294,13 +299,8 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		s->alarm_low_threshold
 			= config_get_sensor_alarm_low_threshold(s->id);
 
-		if (is_temp_type(s->type) || is_fan_type(s->type)) {
-			s->alarm_enabled
+		s->alarm_enabled
 			    = config_get_sensor_alarm_enabled(s->id);
-		} else {
-			s->alarm_high_threshold = 0;
-			s->alarm_enabled = 0;
-		}
 
 		sensor_cur++;
 	}
@@ -309,6 +309,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 static void associate_preferences(struct psensor **sensors)
 {
 	struct psensor **sensor_cur = sensors;
+
 	while (*sensor_cur) {
 		char *n;
 		struct psensor *s = *sensor_cur;
@@ -336,7 +337,7 @@ static void log_init()
 	dir = get_psensor_user_dir();
 
 	if (!dir)
-		return ;
+		return;
 
 	path = malloc(strlen(dir)+1+strlen("log")+1);
 	sprintf(path, "%s/%s", dir, "log");
@@ -465,6 +466,7 @@ static struct psensor **create_sensors_list(const char *url,
 #ifdef HAVE_GTOP
 		sensors = cpu_psensor_list_add(sensors, 600);
 #endif
+		udisks2_psensor_list_add(&sensors, 600);
 	}
 
 	associate_preferences(sensors);
@@ -593,7 +595,7 @@ int main(int argc, char **argv)
 
 	ret = pthread_create(&thread, NULL, update_measures, &ui);
 
-	if (!ret)
+	if (ret)
 		log_err(_("Failed to create thread for monitoring sensors"));
 
 	ui.graph_update_interval = ui.config->graph_update_interval;
@@ -617,6 +619,8 @@ int main(int argc, char **argv)
 	else
 		initial_window_show(&ui);
 
+	log_debug("translators: %s\n", _("translator-credits"));
+
 	/* main loop */
 	gtk_main();