fixed sensor type displayed in sensor preferences dialog.

next release will be 0.7.0.0

diff --git a/NEWS b/NEWS
index 1e22fd4..94e89f0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+* v0.7.0.0
+
+** psensor: fixed sensor type displayed in sensor preferences dialog.
+
+* v0.6.2.16
+
+** psensor: removed -pedantic and ignores deprecation warnings
+   to fix compilation against the glib version of Ubuntu Precise.
+   It fixes Ubuntu bug #905893.
+
 * v0.6.2.15
 
 ** psensor-server: uses glibtop instead of 'sysinfo' which is not

diff --git a/configure.ac b/configure.ac
index 472ffa6..521f334 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.64])
-AC_INIT([psensor], [0.6.2.16],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
+AC_INIT([psensor], [0.7.0.0],[jeanfi@gmail.com],[psensor],[http://wpitchoune.net/psensor])
 
 AM_INIT_AUTOMAKE([-Wall -Werror gnu])
 

diff --git a/src/lib/psensor.c b/src/lib/psensor.c
index 141779e..de726e4 100644 (file)
--- a/src/lib/psensor.c
+++ b/src/lib/psensor.c
@@ -396,30 +396,30 @@ struct psensor **get_all_sensors(int values_max_length)
 
 const char *psensor_type_to_str(unsigned int type)
 {
-       if (type & SENSOR_TYPE_REMOTE)
-               return "Remote";
-
-       if (type & SENSOR_TYPE_LMSENSOR_TEMP)
-               return "Temperature";
-
-       if (type & SENSOR_TYPE_LMSENSOR_FAN)
-               return "Fan";
-
-       if (type & SENSOR_TYPE_NVIDIA_TEMP)
+       if ((type & SENSOR_TYPE_NVIDIA_TEMP) == SENSOR_TYPE_NVIDIA_TEMP)
                return "NVidia GPU Temperature";
 
-       if (type & SENSOR_TYPE_AMD_TEMP)
+       if ((type & SENSOR_TYPE_AMD_TEMP) == SENSOR_TYPE_AMD_TEMP)
                return "AMD GPU Temperature";
 
-       if (type & SENSOR_TYPE_AMD_FAN)
+       if ((type & SENSOR_TYPE_AMD_FAN) == SENSOR_TYPE_AMD_FAN)
                return "AMD GPU Fan Speed";
 
-       if (type & SENSOR_TYPE_HDD_TEMP)
+       if ((type & SENSOR_TYPE_HDD_TEMP) == SENSOR_TYPE_HDD_TEMP)
                return "HDD Temperature";
 
        if (type & SENSOR_TYPE_CPU_USAGE)
                return "CPU Usage";
 
+       if (type & SENSOR_TYPE_TEMP)
+               return "Temperature";
+
+       if (type & SENSOR_TYPE_FAN)
+               return "Fan";
+
+       if (type & SENSOR_TYPE_REMOTE)
+               return "Remote";
+
        return "N/A";           /* should not be possible */
 }