appindicator displays unit of sensor values

[psensor.git] / src / ui_appindicator.c

diff --git a/src/ui_appindicator.c b/src/ui_appindicator.c
index 153046e..268f314 100644 (file)
--- a/src/ui_appindicator.c
+++ b/src/ui_appindicator.c
@@ -63,8 +63,16 @@ cb_sensor_preferences(GtkMenuItem *mi, gpointer data)
 {
        struct ui_psensor *ui = data;
 
+#ifdef HAVE_APPINDICATOR_029
+       gdk_threads_enter();
+#endif
+
        if (ui->sensors && *ui->sensors)
                ui_sensorpref_dialog_run(*ui->sensors, ui);
+
+#ifdef HAVE_APPINDICATOR_029
+       gdk_threads_leave();
+#endif
 }
 
 static const char *menu_desc =
@@ -108,9 +116,10 @@ static void update_sensor_menu_item(GtkMenuItem *item, struct psensor *s)
 {
        gchar *str;
 
-       str = g_strdup_printf("%s: %2.f",
+       str = g_strdup_printf("%s: %2.f %s",
                              s->name,
-                             psensor_get_current_value(s));
+                             psensor_get_current_value(s),
+                             psensor_type_to_unit_str(s->type));
 
        gtk_menu_item_set_label(item, str);