X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=6ca0815f8a57c19e7471f62f39fa9e8edb6de583;hb=8a3d16ade26321374c684080d627cf12ba71e598;hp=715eed59a43f85290ad93e04a578330753851bee;hpb=7bb2223ce108e56525eddc6e01627c0fd2ecc3df;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 715eed5..6ca0815 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -89,7 +89,7 @@ sensor_pref_new(struct psensor *s, struct config *cfg)
 static void sensor_pref_free(struct sensor_pref *p)
 {
 	if (!p)
-		return ;
+		return;
 
 	free(p->name);
 	free(p->color);
@@ -190,7 +190,7 @@ void ui_sensorpref_color_set_cb(GtkColorButton *widget, gpointer data)
 
 	if (p) {
 		gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(widget), &color);
-		color_set_f(p->color, color.red, color.green, color.blue);
+		color_set(p->color, color.red, color.green, color.blue);
 	}
 }
 
@@ -290,23 +290,12 @@ update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 	w_appindicator_label_enabled = GTK_TOGGLE_BUTTON
 		(gtk_builder_get_object(builder, "indicator_label_checkbox"));
 
-	if (is_temp_type(s->type) || is_fan_type(s->type)) {
-		gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
-		gtk_spin_button_set_value(w_high_threshold,
-					  p->alarm_high_threshold);
-		gtk_spin_button_set_value(w_low_threshold,
-					  p->alarm_low_threshold);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
-	} else {
-		gtk_toggle_button_set_active(w_alarm, 0);
-		gtk_spin_button_set_value(w_high_threshold, 0);
-		gtk_spin_button_set_value(w_low_threshold, 0);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE);
-	}
+	gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
+	gtk_spin_button_set_value(w_high_threshold, p->alarm_high_threshold);
+	gtk_spin_button_set_value(w_low_threshold, p->alarm_low_threshold);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
 
 	gtk_toggle_button_set_active(w_appindicator_enabled,
 				     p->appindicator_enabled);
@@ -385,7 +374,10 @@ static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 		config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
 	}
 
-	color_set(s->color, p->color->red, p->color->green, p->color->blue);
+	color_set(s->color,
+		  p->color->red,
+		  p->color->green,
+		  p->color->blue);
 	config_set_sensor_color(s->id, s->color);
 
 	if (s->appindicator_enabled != p->appindicator_enabled) {
@@ -450,7 +442,7 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 	if (!ok) {
 		log_printf(LOG_ERR, error->message);
 		g_error_free(error);
-		return ;
+		return;
 	}
 
 	w_sensors_list