X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=a1af9bc77f50ee388a7cf06b85bfc2202ccc8fc2;hb=912b5d1986633786a656bb3361f7ae9c1263acef;hp=1a6d774631e527ed192d5a0b19435bbfd8fa237f;hpb=d860f90166069842cd5c00b55ee35bcd4b54f0eb;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 1a6d774..a1af9bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -53,8 +53,6 @@
 #include <ui_status.h>
 #include <ui_unity.h>
 
-
-
 static const char *program_name;
 
 static void print_version(void)
@@ -226,58 +224,11 @@ static void cb_alarm_raised(struct psensor *sensor, void *data)
 	}
 }
 
-static void associate_colors(struct psensor **sensors)
-{
-	GdkRGBA rgba;
-	/* copied from the default colors of the gtk color color
-	 * chooser. */
-	const char *default_colors[27] = {
-		"#ef2929",  /* Scarlet Red */
-		"#fcaf3e",  /* Orange */
-		"#fce94f",  /* Butter */
-		"#8ae234",  /* Chameleon */
-		"#729fcf",  /* Sky Blue */
-		"#ad7fa8",  /* Plum */
-		"#e9b96e",  /* Chocolate */
-		"#888a85",  /* Aluminum 1 */
-		"#eeeeec",  /* Aluminum 2 */
-		"#cc0000",
-		"#f57900",
-		"#edd400",
-		"#73d216",
-		"#3465a4",
-		"#75507b",
-		"#c17d11",
-		"#555753",
-		"#d3d7cf",
-		"#a40000",
-		"#ce5c00",
-		"#c4a000",
-		"#4e9a06",
-		"#204a87",
-		"#5c3566",
-		"#8f5902",
-		"#2e3436",
-		"#babdb6"
-	};
-	int i;
-	struct psensor **cur;
-	struct color c;
-
-	for (cur = sensors, i = 0; *cur; cur++, i++) {
-		gdk_rgba_parse(&rgba, default_colors[i % 27]);
-		c.red = rgba.red;
-		c.green = rgba.green;
-		c.blue = rgba.blue;
-
-		(*cur)->color = config_get_sensor_color((*cur)->id, &c);
-	}
-}
-
 static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
 	struct psensor **sensor_cur = sensors;
+	bool ret;
 
 	while (*sensor_cur) {
 		struct psensor *s = *sensor_cur;
@@ -285,10 +236,17 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 		s->cb_alarm_raised = cb_alarm_raised;
 		s->cb_alarm_raised_data = ui;
 
-		s->alarm_high_threshold
-			= config_get_sensor_alarm_high_threshold(s->id);
-		s->alarm_low_threshold
-			= config_get_sensor_alarm_low_threshold(s->id);
+		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;
+
+		ret = config_get_sensor_alarm_low_threshold
+			(s->id, &s->alarm_low_threshold);
+
+		if (!ret && s->min != UNKNOWN_DBL_VALUE)
+			s->alarm_low_threshold = s->min;
 
 		sensor_cur++;
 	}
@@ -453,7 +411,6 @@ static struct psensor **create_sensors_list(const char *url)
 	}
 
 	associate_preferences(sensors);
-	associate_colors(sensors);
 
 	return sensors;
 }