projects
/
psensor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ea3aed5
)
cleanup and optim
author
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 29 Mar 2013 19:32:04 +0000
(19:32 +0000)
committer
Jean-Philippe Orsini
<jeanfi@gmail.com>
Fri, 29 Mar 2013 19:32:04 +0000
(19:32 +0000)
src/ui_sensorlist.c
patch
|
blob
|
history
diff --git
a/src/ui_sensorlist.c
b/src/ui_sensorlist.c
index
ba38437
..
b51de4d
100644
(file)
--- a/
src/ui_sensorlist.c
+++ b/
src/ui_sensorlist.c
@@
-57,56
+57,52
@@
static int col_index_to_col(int idx)
void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
{
void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
{
- char *s
tr, *scolor
;
+ char *s
color, *value, *min, *max
;
struct psensor *s;
GtkTreeIter iter;
struct psensor *s;
GtkTreeIter iter;
- struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
- GtkTreeModel *model
- = gtk_tree_view_get_model(ui_sl->treeview);
- gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
+ GtkTreeModel *model;
+ gboolean valid;
int use_celcius;
GdkColor color;
int use_celcius;
GdkColor color;
+ GtkListStore *store;
+
+ model = gtk_tree_view_get_model(ui->sensors_tree);
+ store = GTK_LIST_STORE(model);
use_celcius = ui->config->temperature_unit == CELCIUS;
use_celcius = ui->config->temperature_unit == CELCIUS;
+ valid = gtk_tree_model_get_iter_first(model, &iter);
while (valid) {
gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
while (valid) {
gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
- str = psensor_value_to_str(s->type,
- s->measures[s->values_max_length -
- 1].value,
- use_celcius);
+ value = psensor_value_to_str(s->type,
+ s->measures[s->values_max_length -
+ 1].value,
+ use_celcius);
+ min = psensor_value_to_str(s->type, s->min, use_celcius);
+ max = psensor_value_to_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
+ gtk_list_store_set(store, &iter,
+ COL_TEMP, value,
+ COL_TEMP_MIN, min,
+ COL_TEMP_MAX, max,
-1);
-1);
- free(str);
-
- str = psensor_value_to_str(s->type, s->min, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_TEMP_MIN, str, -1);
- free(str);
-
- str = psensor_value_to_str(s->type, s->max, use_celcius);
- gtk_list_store_set(GTK_LIST_STORE(model), &iter,
- COL_TEMP_MAX, str, -1);
- free(str);
+ free(value);
+ free(min);
+ free(max);
if (complete) {
color.red = s->color->red;
color.green = s->color->green;
color.blue = s->color->blue;
if (complete) {
color.red = s->color->red;
color.green = s->color->green;
color.blue = s->color->blue;
-
+
scolor = gdk_color_to_string(&color);
scolor = gdk_color_to_string(&color);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_NAME, s->name, -1);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_COLOR_STR, scolor, -1);
-
- gtk_list_store_set(GTK_LIST_STORE(model),
- &iter, COL_ENABLED, s->enabled, -1);
-
+
+ gtk_list_store_set(store, &iter,
+ COL_NAME, s->name,
+ COL_COLOR_STR, scolor,
+ COL_ENABLED, s->enabled,
+ -1);
free(scolor);
}
free(scolor);
}