fixed style

[psensor.git] / src / ui_sensorpref.c

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 5ed1e49..bb739bb 100644 (file)
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -23,10 +23,10 @@
 #include <cfg.h>
 #include <temperature.h>
 #include <ui_appindicator.h>
+#include <ui_color.h>
 #include <ui_pref.h>
 #include <ui_sensorlist.h>
 #include <ui_sensorpref.h>
-#include <ui_color.h>
 
 enum {
        COL_NAME = 0,
@@ -53,9 +53,9 @@ static GtkSpinButton *w_sensor_high_threshold;
 static GtkSpinButton *w_sensor_low_threshold;
 static GtkListStore *store;
 
-
 /* 'true' when the notifications of field changes are due to the change
- * of the selected sensor. */
+ * of the selected sensor.
+ */
 static bool ignore_changes;
 
 static struct psensor *get_selected_sensor(void)
@@ -236,7 +236,7 @@ ui_sensorpref_alarm_high_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
                return;
 
        v = gtk_spin_button_get_value(btn);
-       if (config_get_sensor_unit() == FAHRENHEIT)
+       if (config_get_temperature_unit() == FAHRENHEIT)
                v = fahrenheit_to_celsius(v);
 
        config_set_sensor_alarm_high_threshold(s->id, v);
@@ -259,7 +259,7 @@ ui_sensorpref_alarm_low_threshold_changed_cb(GtkSpinButton *btn, gpointer data)
                return;
 
        v = gtk_spin_button_get_value(btn);
-       if (config_get_sensor_unit() == FAHRENHEIT)
+       if (config_get_temperature_unit() == FAHRENHEIT)
                v = fahrenheit_to_celsius(v);
 
        config_set_sensor_alarm_low_threshold(s->id, v);
@@ -290,7 +290,7 @@ static void update_pref(struct psensor *s)
                chip = _("Unknown");
        gtk_label_set_text(w_sensor_chipname, chip);
 
-       use_celsius = config_get_sensor_unit() == CELSIUS ? 1 : 0;
+       use_celsius = config_get_temperature_unit() == CELSIUS ? 1 : 0;
 
        if (s->min == UNKNOWN_DBL_VALUE)
                smin = strdup(_("Unknown"));
@@ -341,12 +341,12 @@ static void update_pref(struct psensor *s)
        gtk_toggle_button_set_active(w_sensor_alarm,
                                     config_get_sensor_alarm_enabled(s->id));
 
-       threshold = config_get_sensor_alarm_high_threshold(s->id);
+       threshold = s->alarm_high_threshold;
        if (!use_celsius)
                threshold = celsius_to_fahrenheit(threshold);
        gtk_spin_button_set_value(w_sensor_high_threshold, threshold);
 
-       threshold = config_get_sensor_alarm_low_threshold(s->id);
+       threshold = s->alarm_low_threshold;
        if (!use_celsius)
                threshold = celsius_to_fahrenheit(threshold);
        gtk_spin_button_set_value(w_sensor_low_threshold, threshold);