X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_unity.c;h=b2884472afd73f4f6c4ba82c461202c52b0e0f31;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hp=0ab2e1290d9517dd90f1471971e830d4c996f4be;hpb=9d77e6ab0ca102b9d42072df4fd9d2378897a5ca;p=psensor.git

diff --git a/src/ui_unity.c b/src/ui_unity.c
index 0ab2e12..b288447 100644
--- a/src/ui_unity.c
+++ b/src/ui_unity.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2014 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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
@@ -22,9 +22,21 @@
 #include <temperature.h>
 #include <ui_unity.h>
 
-static int initialized;
 static UnityLauncherEntry *psensor_entry;
-static unsigned int last_visible = -1;
+static bool count_visible;
+
+static void
+count_visible_changed_cbk(GSettings *settings, gchar *key, gpointer data)
+{
+	count_visible = config_is_count_visible();
+
+	if (count_visible) {
+		unity_launcher_entry_set_count(psensor_entry, 0);
+		unity_launcher_entry_set_count_visible(psensor_entry, TRUE);
+	} else {
+		unity_launcher_entry_set_count_visible(psensor_entry, FALSE);
+	}
+}
 
 static double get_max_current_value(struct psensor **sensors, unsigned int type)
 {
@@ -48,36 +60,39 @@ static double get_max_current_value(struct psensor **sensors, unsigned int type)
 	return m;
 }
 
-void ui_unity_launcher_entry_update(struct psensor **sensors,
-				    unsigned int show,
-				    int use_celsius)
+void ui_unity_launcher_entry_update(struct psensor **sensors)
 {
 	double v;
 
-	if (!initialized) {
-		psensor_entry = unity_launcher_entry_get_for_desktop_file
-			(PSENSOR_DESKTOP_FILE);
+	if (!count_visible || !sensors || !*sensors)
+		return;
 
-		unity_launcher_entry_set_count(psensor_entry, 0);
-		initialized = 1;
-	}
+	v = get_max_current_value(sensors, SENSOR_TYPE_TEMP);
 
-	if (last_visible != show) {
-		if (show)
-			unity_launcher_entry_set_count_visible(psensor_entry,
-							       TRUE);
-		else
-			unity_launcher_entry_set_count_visible(psensor_entry,
-							       FALSE);
-		last_visible = show;
+	if (v != UNKNOWN_DBL_VALUE) {
+		if (config_get_temperature_unit() == FAHRENHEIT)
+			v = celsius_to_fahrenheit(v);
+
+		unity_launcher_entry_set_count(psensor_entry, v);
 	}
+}
 
-	if (sensors && *sensors) {
-		v = get_max_current_value(sensors, SENSOR_TYPE_TEMP);
+void ui_unity_init(void)
+{
+	psensor_entry = unity_launcher_entry_get_for_desktop_file
+		(PSENSOR_DESKTOP_FILE);
 
-		if (!use_celsius)
-			v = celsius_to_fahrenheit(v);
+	count_visible = config_is_count_visible();
 
-		unity_launcher_entry_set_count(psensor_entry, v);
+	if (count_visible) {
+		unity_launcher_entry_set_count(psensor_entry, 0);
+		unity_launcher_entry_set_count_visible(psensor_entry, TRUE);
+	} else {
+		unity_launcher_entry_set_count_visible(psensor_entry, FALSE);
 	}
+
+	g_signal_connect_after(config_get_GSettings(),
+			       "changed::interface-unity-launcher-count-disabled",
+			       G_CALLBACK(count_visible_changed_cbk),
+			       NULL);
 }