From 633311cbd5621fefdc0373c5ee967a87925e5221 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Orsini Date: Fri, 4 May 2012 15:49:00 +0000 Subject: [PATCH] fixed type 'thresold' instead of 'threshold' --- po/de.po | 6 +-- po/fr.po | 8 ++-- po/it.po | 6 +-- po/psensor.pot | 6 +-- po/pt_BR.po | 6 +-- po/ru.po | 6 +-- po/sl.po | 6 +-- po/sr.po | 6 +-- po/tr.po | 6 +-- po/uk.po | 6 +-- po/zh_CN.po | 6 +-- src/cfg.c | 24 ++++++------ src/cfg.h | 8 ++-- src/glade/sensor-edit.glade | 26 ++++++------ src/lib/psensor.c | 6 +-- src/lib/psensor.h | 4 +- src/main.c | 10 ++--- src/ui_sensorpref.c | 96 ++++++++++++++++++++++----------------------- 18 files changed, 122 insertions(+), 120 deletions(-) diff --git a/po/de.po b/po/de.po index d0fa907..0bedb15 100644 --- a/po/de.po +++ b/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-28 16:28+0000\n" "Last-Translator: \n" "Language-Team: German\n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/fr.po b/po/fr.po index 8a7f638..28936e8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-05-01 12:09+0000\n" "Last-Translator: jeanfi \n" "Language-Team: French <>\n" @@ -158,11 +158,13 @@ msgid "Draw sensor curve" msgstr "Dessiner la courbe de la sonde" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +#, fuzzy +msgid "High threshold:" msgstr "Seuil supérieur:" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +#, fuzzy +msgid "Low threshold:" msgstr "Seuil inférieur:" #: src/lib/amd.c:150 diff --git a/po/it.po b/po/it.po index 61fa716..0180f99 100644 --- a/po/it.po +++ b/po/it.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-28 16:28+0000\n" "Last-Translator: \n" "Language-Team: Italian\n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/psensor.pot b/po/psensor.pot index 2b47413..6c949cc 100644 --- a/po/psensor.pot +++ b/po/psensor.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -157,11 +157,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/pt_BR.po b/po/pt_BR.po index 24f7ded..4b30c13 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-28 21:07+0000\n" "Last-Translator: \n" "Language-Team: Brazilian Portuguese\n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/ru.po b/po/ru.po index 5bef1ea..384c8e9 100644 --- a/po/ru.po +++ b/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor 0.7.0.x\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-05-02 17:33+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Russian\n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/sl.po b/po/sl.po index 239db2d..b229aef 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-14 21:02+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Slovenian \n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/sr.po b/po/sr.po index 3cb5c8c..70da086 100644 --- a/po/sr.po +++ b/po/sr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: Мирослав Николић \n" "Language-Team: Serbian \n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/tr.po b/po/tr.po index b41b99a..1388cf5 100644 --- a/po/tr.po +++ b/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-04-28 11:24+0000\n" "Last-Translator: zeugma \n" "Language-Team: Turkish \n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/uk.po b/po/uk.po index 1f60f57..befdf81 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-05-03 17:44+0000\n" "Last-Translator: Ilya Volchanetskiy \n" "Language-Team: Ukrainian \n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/po/zh_CN.po b/po/zh_CN.po index b5e80ce..c0a8991 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: psensor\n" "Report-Msgid-Bugs-To: jeanfi@gmail.com\n" -"POT-Creation-Date: 2012-05-04 17:38+0200\n" +"POT-Creation-Date: 2012-05-04 17:47+0200\n" "PO-Revision-Date: 2012-05-01 12:09+0000\n" "Last-Translator: Wang Dianjin \n" "Language-Team: Chinese (simplified)\n" @@ -158,11 +158,11 @@ msgid "Draw sensor curve" msgstr "绘制监视曲线" #: src/glade/sensor-edit.glade:366 -msgid "High thresold:" +msgid "High threshold:" msgstr "" #: src/glade/sensor-edit.glade:381 -msgid "Low thresold:" +msgid "Low threshold:" msgstr "" #: src/lib/amd.c:150 diff --git a/src/cfg.c b/src/cfg.c index 4c646f6..21989a7 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -28,8 +28,8 @@ static const char *KEY_SENSORS = "/apps/psensor/sensors"; static const char *ATT_SENSOR_ALARM_ENABLED = "alarm/enabled"; -static const char *ATT_SENSOR_ALARM_HIGH_THRESOLD = "alarm/high_thresold"; -static const char *ATT_SENSOR_ALARM_LOW_THRESOLD = "alarm/low_thresold"; +static const char *ATT_SENSOR_ALARM_HIGH_THRESHOLD = "alarm/high_threshold"; +static const char *ATT_SENSOR_ALARM_LOW_THRESHOLD = "alarm/low_threshold"; static const char *ATT_SENSOR_COLOR = "color"; static const char *ATT_SENSOR_ENABLED = "enabled"; static const char *ATT_SENSOR_NAME = "name"; @@ -261,12 +261,12 @@ void config_set_sensor_color(const char *sid, const struct color *color) free(key); } -int config_get_sensor_alarm_high_thresold(const char *sid) +int config_get_sensor_alarm_high_threshold(const char *sid) { int res; char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); res = gconf_client_get_int(client, key, NULL); free(key); @@ -274,21 +274,21 @@ int config_get_sensor_alarm_high_thresold(const char *sid) } void -config_set_sensor_alarm_high_thresold(const char *sid, int thresold) +config_set_sensor_alarm_high_threshold(const char *sid, int threshold) { char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESOLD); - gconf_client_set_int(client, key, thresold, NULL); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_HIGH_THRESHOLD); + gconf_client_set_int(client, key, threshold, NULL); free(key); } -int config_get_sensor_alarm_low_thresold(const char *sid) +int config_get_sensor_alarm_low_threshold(const char *sid) { int res; char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); res = gconf_client_get_int(client, key, NULL); free(key); @@ -296,12 +296,12 @@ int config_get_sensor_alarm_low_thresold(const char *sid) } void -config_set_sensor_alarm_low_thresold(const char *sid, int thresold) +config_set_sensor_alarm_low_threshold(const char *sid, int threshold) { char *key; - key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESOLD); - gconf_client_set_int(client, key, thresold, NULL); + key = get_sensor_att_key(sid, ATT_SENSOR_ALARM_LOW_THRESHOLD); + gconf_client_set_int(client, key, threshold, NULL); free(key); } diff --git a/src/cfg.h b/src/cfg.h index fe90b96..9c2a785 100644 --- a/src/cfg.h +++ b/src/cfg.h @@ -85,11 +85,11 @@ void config_cleanup(); struct color *config_get_sensor_color(const char *sid, const struct color *); void config_set_sensor_color(const char *sid, const struct color *); -int config_get_sensor_alarm_high_thresold(const char *); -void config_set_sensor_alarm_high_thresold(const char *, int); +int config_get_sensor_alarm_high_threshold(const char *); +void config_set_sensor_alarm_high_threshold(const char *, int); -int config_get_sensor_alarm_low_thresold(const char *); -void config_set_sensor_alarm_low_thresold(const char *, int); +int config_get_sensor_alarm_low_threshold(const char *); +void config_set_sensor_alarm_low_threshold(const char *, int); int config_get_sensor_alarm_enabled(const char *); void config_set_sensor_alarm_enabled(const char *, int); diff --git a/src/glade/sensor-edit.glade b/src/glade/sensor-edit.glade index ef1fab4..409c815 100644 --- a/src/glade/sensor-edit.glade +++ b/src/glade/sensor-edit.glade @@ -1,13 +1,13 @@ - + -9999 9999 1 10 - + -9999 9999 1 @@ -297,14 +297,14 @@ True False - + True True • True False False - alarm_high_thresold_value + alarm_high_threshold_value 1 True True @@ -317,7 +317,7 @@ - + True False start @@ -359,11 +359,11 @@ - + True False 0.0099999997764825821 - High thresold: + High threshold: 9 @@ -374,11 +374,11 @@ - + True False 0.0099999997764825821 - Low thresold: + Low threshold: 10 @@ -389,18 +389,18 @@ - + True False - + True True • True False False - alarm_low_thresold_value + alarm_low_threshold_value 1 True True @@ -413,7 +413,7 @@ - + True False start diff --git a/src/lib/psensor.c b/src/lib/psensor.c index 5726b2d..1ab82bd 100644 --- a/src/lib/psensor.c +++ b/src/lib/psensor.c @@ -50,8 +50,8 @@ struct psensor *psensor_create(char *id, char *name, psensor->measures = measures_dbl_create(values_max_length); psensor->alarm_enabled = 0; - psensor->alarm_high_thresold = 0; - psensor->alarm_low_thresold = 0; + psensor->alarm_high_threshold = 0; + psensor->alarm_low_threshold = 0; psensor->cb_alarm_raised = NULL; psensor->cb_alarm_raised_data = NULL; @@ -274,7 +274,7 @@ psensor_set_current_measure(struct psensor *s, s->max = v; if (s->alarm_enabled) { - if (v > s->alarm_high_thresold || v < s->alarm_low_thresold) { + if (v > s->alarm_high_threshold || v < s->alarm_low_threshold) { if (!s->alarm_raised && s->cb_alarm_raised) s->cb_alarm_raised(s, s->cb_alarm_raised_data); diff --git a/src/lib/psensor.h b/src/lib/psensor.h index 2673b6b..c9535b9 100644 --- a/src/lib/psensor.h +++ b/src/lib/psensor.h @@ -87,8 +87,8 @@ struct psensor { /* Whether alarm alert is enabled for this sensor */ unsigned int alarm_enabled; - int alarm_high_thresold; - int alarm_low_thresold; + int alarm_high_threshold; + int alarm_low_threshold; /* Whether an alarm is raised for this sensor */ unsigned int alarm_raised; diff --git a/src/main.c b/src/main.c index 61b920d..c1a6e10 100644 --- a/src/main.c +++ b/src/main.c @@ -291,16 +291,16 @@ 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_thresold - = config_get_sensor_alarm_high_thresold(s->id); - s->alarm_low_thresold - = config_get_sensor_alarm_low_thresold(s->id); + s->alarm_high_threshold + = config_get_sensor_alarm_high_threshold(s->id); + 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 = config_get_sensor_alarm_enabled(s->id); } else { - s->alarm_high_thresold = 0; + s->alarm_high_threshold = 0; s->alarm_enabled = 0; } diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c index e9ae6c0..d5ef41f 100644 --- a/src/ui_sensorpref.c +++ b/src/ui_sensorpref.c @@ -32,8 +32,8 @@ struct sensor_pref { int enabled; struct color *color; int alarm_enabled; - int alarm_high_thresold; - int alarm_low_thresold; + int alarm_high_threshold; + int alarm_low_threshold; }; struct cb_data { @@ -56,13 +56,13 @@ static struct sensor_pref *sensor_pref_new(struct psensor *s, p->color = color_dup(s->color); if (cfg->temperature_unit == CELCIUS) { - p->alarm_high_thresold = s->alarm_high_thresold; - p->alarm_low_thresold = s->alarm_low_thresold; + p->alarm_high_threshold = s->alarm_high_threshold; + p->alarm_low_threshold = s->alarm_low_threshold; } else { - p->alarm_high_thresold - = celcius_to_fahrenheit(s->alarm_high_thresold); - p->alarm_low_thresold - = celcius_to_fahrenheit(s->alarm_low_thresold); + p->alarm_high_threshold + = celcius_to_fahrenheit(s->alarm_high_threshold); + p->alarm_low_threshold + = celcius_to_fahrenheit(s->alarm_low_threshold); } return p; @@ -207,7 +207,7 @@ static void on_color_set(GtkColorButton *widget, gpointer data) } } -static void on_alarm_high_thresold_changed(GtkSpinButton *btn, gpointer data) +static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data) { struct cb_data *cbdata; struct sensor_pref *p; @@ -217,10 +217,10 @@ static void on_alarm_high_thresold_changed(GtkSpinButton *btn, gpointer data) p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) - p->alarm_high_thresold = gtk_spin_button_get_value(btn); + p->alarm_high_threshold = gtk_spin_button_get_value(btn); } -static void on_alarm_low_thresold_changed(GtkSpinButton *btn, gpointer data) +static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data) { struct cb_data *cbdata; struct sensor_pref *p; @@ -230,7 +230,7 @@ static void on_alarm_low_thresold_changed(GtkSpinButton *btn, gpointer data) p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs); if (p) - p->alarm_low_thresold = gtk_spin_button_get_value(btn); + p->alarm_low_threshold = gtk_spin_button_get_value(btn); } static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) @@ -248,15 +248,15 @@ static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata) "toggled", G_CALLBACK(on_alarm_toggled), cbdata); g_signal_connect(gtk_builder_get_object(builder, - "sensor_alarm_high_thresold"), + "sensor_alarm_high_threshold"), "value-changed", - G_CALLBACK(on_alarm_high_thresold_changed), + G_CALLBACK(on_alarm_high_threshold_changed), cbdata); g_signal_connect(gtk_builder_get_object(builder, - "sensor_alarm_low_thresold"), + "sensor_alarm_low_threshold"), "value-changed", - G_CALLBACK(on_alarm_low_thresold_changed), + G_CALLBACK(on_alarm_low_threshold_changed), cbdata); } @@ -266,11 +266,11 @@ update_pref(struct psensor *s, struct config *cfg, GtkBuilder *builder) { - GtkLabel *w_id, *w_type, *w_high_thresold_unit, *w_low_thresold_unit; + GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit; GtkEntry *w_name; GtkToggleButton *w_draw, *w_alarm; GtkColorButton *w_color; - GtkSpinButton *w_high_thresold, *w_low_thresold; + GtkSpinButton *w_high_threshold, *w_low_threshold; GdkColor *color; struct sensor_pref *p = sensor_pref_get(prefs, s); int use_celcius; @@ -295,44 +295,44 @@ update_pref(struct psensor *s, w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "sensor_alarm")); - w_high_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + w_high_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object (builder, - "sensor_alarm_high_thresold")); - w_low_thresold = GTK_SPIN_BUTTON(gtk_builder_get_object + "sensor_alarm_high_threshold")); + w_low_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object (builder, - "sensor_alarm_low_thresold")); + "sensor_alarm_low_threshold")); - w_high_thresold_unit = GTK_LABEL(gtk_builder_get_object + w_high_threshold_unit = GTK_LABEL(gtk_builder_get_object (builder, - "sensor_alarm_high_thresold_unit")); - w_low_thresold_unit = GTK_LABEL(gtk_builder_get_object + "sensor_alarm_high_threshold_unit")); + w_low_threshold_unit = GTK_LABEL(gtk_builder_get_object (builder, - "sensor_alarm_low_thresold_unit")); + "sensor_alarm_low_threshold_unit")); use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0; - gtk_label_set_text(w_high_thresold_unit, + gtk_label_set_text(w_high_threshold_unit, psensor_type_to_unit_str(s->type, use_celcius)); - gtk_label_set_text(w_low_thresold_unit, + gtk_label_set_text(w_low_threshold_unit, psensor_type_to_unit_str(s->type, use_celcius)); 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_thresold, - p->alarm_high_thresold); - gtk_spin_button_set_value(w_low_thresold, - p->alarm_low_thresold); + 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_thresold), TRUE); - gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), 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_thresold, 0); - gtk_spin_button_set_value(w_low_thresold, 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_thresold), FALSE); - gtk_widget_set_sensitive(GTK_WIDGET(w_low_thresold), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), FALSE); + gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE); } } @@ -407,19 +407,19 @@ apply_prefs(struct sensor_pref **prefs, if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) { - s->alarm_high_thresold = fahrenheit_to_celcius - (p->alarm_high_thresold); - s->alarm_low_thresold = fahrenheit_to_celcius - (p->alarm_low_thresold); + s->alarm_high_threshold = fahrenheit_to_celcius + (p->alarm_high_threshold); + s->alarm_low_threshold = fahrenheit_to_celcius + (p->alarm_low_threshold); } else { - s->alarm_high_thresold = p->alarm_high_thresold; - s->alarm_low_thresold = p->alarm_low_thresold; + s->alarm_high_threshold = p->alarm_high_threshold; + s->alarm_low_threshold = p->alarm_low_threshold; } - config_set_sensor_alarm_high_thresold(s->id, - s->alarm_high_thresold); - config_set_sensor_alarm_low_thresold(s->id, - s->alarm_low_thresold); + config_set_sensor_alarm_high_threshold(s->id, + s->alarm_high_threshold); + config_set_sensor_alarm_low_threshold(s->id, + s->alarm_low_threshold); if (s->alarm_enabled != p->alarm_enabled) { s->alarm_enabled = p->alarm_enabled; -- 2.7.4