projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed typo (celcius/celsius)
[psensor.git]
/
src
/
ui_appindicator.c
diff --git
a/src/ui_appindicator.c
b/src/ui_appindicator.c
index
7aa099d
..
c8887c2
100644
(file)
--- a/
src/ui_appindicator.c
+++ b/
src/ui_appindicator.c
@@
-75,12
+75,12
@@
void ui_appindicator_cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
}
static void
}
static void
-update_menu_item(GtkMenuItem *item, struct psensor *s, int use_cel
c
ius)
+update_menu_item(GtkMenuItem *item, struct psensor *s, int use_cel
s
ius)
{
gchar *str;
char *v;
{
gchar *str;
char *v;
- v = psensor_current_value_to_str(s, use_cel
c
ius);
+ v = psensor_current_value_to_str(s, use_cel
s
ius);
str = g_strdup_printf("%s: %s", s->name, v);
str = g_strdup_printf("%s: %s", s->name, v);
@@
-90,7
+90,7
@@
update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
g_free(str);
}
g_free(str);
}
-static void update_menu_items(int use_cel
c
ius)
+static void update_menu_items(int use_cel
s
ius)
{
struct psensor **s;
GtkMenuItem **m;
{
struct psensor **s;
GtkMenuItem **m;
@@
-99,20
+99,19
@@
static void update_menu_items(int use_celcius)
return ;
for (s = sensors, m = menu_items; *s; s++, m++)
return ;
for (s = sensors, m = menu_items; *s; s++, m++)
- update_menu_item(*m, *s, use_cel
c
ius);
+ update_menu_item(*m, *s, use_cel
s
ius);
}
static void
}
static void
-build_sensor_menu_items(const struct ui_psensor *ui,
- GtkMenu *menu)
+build_sensor_menu_items(const struct ui_psensor *ui, GtkMenu *menu)
{
{
- int i, j, n, cel
c
ius;
+ int i, j, n, cel
s
ius;
const char *name;
struct psensor **sorted_sensors;
free(menu_items);
const char *name;
struct psensor **sorted_sensors;
free(menu_items);
- cel
cius = ui->config->temperature_unit == CELC
IUS;
+ cel
sius = ui->config->temperature_unit == CELS
IUS;
sorted_sensors = ui_get_sensors_ordered_by_position(ui);
n = psensor_list_size(sorted_sensors);
sorted_sensors = ui_get_sensors_ordered_by_position(ui);
n = psensor_list_size(sorted_sensors);
@@
-130,7
+129,7
@@
build_sensor_menu_items(const struct ui_psensor *ui,
GTK_WIDGET(menu_items[j]),
j+2);
GTK_WIDGET(menu_items[j]),
j+2);
- update_menu_item(menu_items[j], sensors[j], cel
c
ius);
+ update_menu_item(menu_items[j], sensors[j], cel
s
ius);
j++;
}
j++;
}
@@
-183,7
+182,7
@@
static void update_label(struct ui_psensor *ui)
while (*p) {
if (config_is_appindicator_label_enabled((*p)->id)) {
str = psensor_current_value_to_str
while (*p) {
if (config_is_appindicator_label_enabled((*p)->id)) {
str = psensor_current_value_to_str
- (*p, ui->config->temperature_unit == CEL
C
IUS);
+ (*p, ui->config->temperature_unit == CEL
S
IUS);
if (label == NULL) {
label = str;
if (label == NULL) {
label = str;
@@
-243,7
+242,7
@@
void ui_appindicator_update(struct ui_psensor *ui, unsigned int attention)
app_indicator_set_status(indicator,
APP_INDICATOR_STATUS_ATTENTION);
app_indicator_set_status(indicator,
APP_INDICATOR_STATUS_ATTENTION);
- update_menu_items(ui->config->temperature_unit == CEL
C
IUS);
+ update_menu_items(ui->config->temperature_unit == CEL
S
IUS);
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)
}
static GtkStatusIcon *unity_fallback(AppIndicator *indicator)