From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 4 Apr 2013 06:42:37 +0000 (+0000)
Subject: refactoring
X-Git-Tag: v0.8.0.5~91
X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=commitdiff_plain;h=dcf1b53921f5f9fdab59295be938c766bb572793

refactoring
---

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 2ae6011..bf7765b 100644
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -287,7 +287,7 @@ psensor_set_current_measure(struct psensor *s,
 	}
 }
 
-double psensor_get_current_value(struct psensor *sensor)
+double psensor_get_current_value(const struct psensor *sensor)
 {
 	return sensor->measures[sensor->values_max_length - 1].value;
 }
@@ -541,3 +541,10 @@ struct psensor **psensor_list_copy(struct psensor **sensors)
 	return result;
 }
 
+char *
+psensor_current_value_to_str(const struct psensor *s, unsigned int celcius)
+{
+	return psensor_value_to_str(s->type,
+				    psensor_get_current_value(s),
+				    celcius);
+}
diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index fb06814..0390773 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -184,7 +184,7 @@ void psensor_set_current_value(struct psensor *sensor, double value);
 void psensor_set_current_measure(struct psensor *sensor, double value,
 				 struct timeval tv);
 
-double psensor_get_current_value(struct psensor *sensor);
+double psensor_get_current_value(const struct psensor *);
 
 struct measure *psensor_get_current_measure(struct psensor *sensor);
 
@@ -206,6 +206,7 @@ double get_max_value(struct psensor **sensors, int type);
 double celcius_to_fahrenheit(double c);
 double fahrenheit_to_celcius(double c);
 
+char *psensor_current_value_to_str(const struct psensor *, unsigned int);
 
 void psensor_log_measures(struct psensor **sensors);
 
diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index d070c27..7536952 100644
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -133,20 +133,15 @@ static void
 update_menu_item(GtkMenuItem *item, struct psensor *s, int use_celcius)
 {
 	gchar *str;
-	double v;
+	char *v;
 
-	v = psensor_get_current_value(s);
+	v = psensor_current_value_to_str(s, use_celcius);
 
-	if (is_temp_type(s->type) && !use_celcius)
-		v = celcius_to_fahrenheit(v);
-
-	str = g_strdup_printf("%s: %2.f %s",
-			      s->name,
-			      v,
-			      psensor_type_to_unit_str(s->type, use_celcius));
+	str = g_strdup_printf("%s: %s", s->name, v);
 
 	gtk_menu_item_set_label(item, str);
 
+	free(v);
 	g_free(str);
 }