projects
/
psensor-pkg-debian.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'upstream/0.8.0.6'
[psensor-pkg-debian.git]
/
src
/
ui_unity.c
diff --git
a/src/ui_unity.c
b/src/ui_unity.c
index
9e74002
..
adeacc0
100644
(file)
--- a/
src/ui_unity.c
+++ b/
src/ui_unity.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
2
jeanfi@gmail.com
+ * Copyright (C) 2010-201
4
jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-25,8
+25,12
@@
static UnityLauncherEntry *psensor_entry;
static unsigned int last_visible = -1;
void ui_unity_launcher_entry_update(struct psensor **sensors,
static unsigned int last_visible = -1;
void ui_unity_launcher_entry_update(struct psensor **sensors,
- unsigned int show)
+ unsigned int show,
+ int use_celcius)
{
{
+ double v;
+
+
if (!initialized) {
psensor_entry = unity_launcher_entry_get_for_desktop_file
("psensor.desktop");
if (!initialized) {
psensor_entry = unity_launcher_entry_get_for_desktop_file
("psensor.desktop");
@@
-46,10
+50,11
@@
void ui_unity_launcher_entry_update(struct psensor **sensors,
}
if (sensors && *sensors) {
}
if (sensors && *sensors) {
- double v;
-
v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP);
v = psensor_get_max_current_value(sensors, SENSOR_TYPE_TEMP);
+ if (!use_celcius)
+ v = celcius_to_fahrenheit(v);
+
unity_launcher_entry_set_count(psensor_entry, v);
}
}
unity_launcher_entry_set_count(psensor_entry, v);
}
}