X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=a8e3f61625bad881391484741e12250257036b9b;hb=8a3d16ade26321374c684080d627cf12ba71e598;hp=8d57f5820d3692b2d3aece3025dc337bc359511f;hpb=c41fe74cb87e9a6d1c265d9d7605bc158509b7a9;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 8d57f58..a8e3f61 100644
--- a/src/main.c
+++ b/src/main.c
@@ -136,12 +136,14 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg)
 	}
 }
 
-static void update_measures(struct ui_psensor *ui)
+static void *update_measures(void *data)
 {
 	struct psensor **sensors;
 	struct config *cfg;
 	int period;
+	struct ui_psensor *ui;
 
+	ui = (struct ui_psensor *)data;
 	cfg = ui->config;
 
 	while (1) {
@@ -149,7 +151,7 @@ static void update_measures(struct ui_psensor *ui)
 
 		sensors = ui->sensors;
 		if (!sensors)
-			return;
+			pthread_exit(NULL);
 
 		update_psensor_values_size(sensors, cfg);
 
@@ -252,16 +254,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;
@@ -281,6 +283,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;
 
@@ -292,13 +295,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++;
 	}
@@ -307,11 +305,12 @@ 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;
 
-		s->graph_enabled = config_is_sensor_enabled(s->id);
+		s->graph_enabled = config_is_sensor_graph_enabled(s->id);
 
 		n = config_get_sensor_name(s->id);
 
@@ -334,7 +333,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");
@@ -474,9 +473,8 @@ static struct psensor **create_sensors_list(const char *url,
 int main(int argc, char **argv)
 {
 	struct ui_psensor ui;
-	GError *error;
-	GThread *thread;
-	int optc, cmdok, opti, use_libatasmart, new_instance;
+	pthread_t thread;
+	int optc, cmdok, opti, use_libatasmart, new_instance, ret;
 	char *url = NULL;
 	GApplication *app;
 
@@ -590,11 +588,10 @@ int main(int argc, char **argv)
 
 	ui_enable_alpha_channel(&ui);
 
-	thread = g_thread_create((GThreadFunc) update_measures,
-				 &ui, TRUE, &error);
+	ret = pthread_create(&thread, NULL, update_measures, &ui);
 
-	if (!thread)
-		g_error_free(error);
+	if (ret)
+		log_err(_("Failed to create thread for monitoring sensors"));
 
 	ui.graph_update_interval = ui.config->graph_update_interval;
 
@@ -617,6 +614,8 @@ int main(int argc, char **argv)
 	else
 		initial_window_show(&ui);
 
+	log_debug("translators: %s\n", _("translator-credits"));
+
 	/* main loop */
 	gtk_main();