[Goodies-commits] r3699 - in xfce4-sensors-plugin/trunk: . panel-plugin po

Fabian Nowak timystery at xfce.org
Fri Dec 14 01:47:36 CET 2007


Author: timystery
Date: 2007-12-14 00:47:35 +0000 (Fri, 14 Dec 2007)
New Revision: 3699

Modified:
   xfce4-sensors-plugin/trunk/ChangeLog
   xfce4-sensors-plugin/trunk/configure.in.in
   xfce4-sensors-plugin/trunk/panel-plugin/acpi.h
   xfce4-sensors-plugin/trunk/panel-plugin/hddtemp.c
   xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.c
   xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.h
   xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c
   xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h
   xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
   xfce4-sensors-plugin/trunk/po/de.po
Log:
* support for libsensors4
* version bump
* unknown update to german translation


Modified: xfce4-sensors-plugin/trunk/ChangeLog
===================================================================
--- xfce4-sensors-plugin/trunk/ChangeLog	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/ChangeLog	2007-12-14 00:47:35 UTC (rev 3699)
@@ -1,394 +1,404 @@
+2007-12-14 timystery
+    * added support for libsensors4
+2007-12-11 timystery
+    * removed remainders of playing around with g_spawn*
+    * removed some debug statements
+    * added another check for hddtemp not being installed properly.
+    * acpi working?
+    * removed bug leading to failing assertion when removing the graphical
+    labels, especially when toggling sensors features.
+
 2007-11-18 timystery
-	* Hddtemp can be specified at configure-time now and now longer relies
-	statically on /usr/sbin .
-	* acpi implementation going on.
+    * Hddtemp can be specified at configure-time now and no longer relies
+    statically on /usr/sbin .
+    * acpi implementation going on.
 
 2007-11-15 timystery
-	* Rewrote big parts of configure.in.in to better support enable/disable.
+    * Rewrote big parts of configure.in.in to better support enable/disable.
 
 2007-11-10 timystery
-	* Went through the plugin with valgrind and removed lots of sources for
-	data accumulation.
+    * Went through the plugin with valgrind and removed lots of sources for
+    data accumulation.
 
 2006-10 - 2007-11 timystery
 
-	* New internal structure being able to run with ACPI, hddtemp and lm
-	  sensors independently, should make plugin work on any OS.
-	* new settings interface
-	* new translations
+    * New internal structure being able to run with ACPI, hddtemp and lm
+      sensors independently, should make plugin work on any OS.
+    * new settings interface
+    * new translations
 
 2005-11-02 17:19  byunghyunchoi
 
-	* xfce4-fsguard-plugin/trunk/po/ko.po,
-	  xfce4-modemlights-plugin/trunk/po/ko.po, po/ko.po,
-	  xfce4-wavelan-plugin/trunk/po/ko.po: 11/03/2005: ByungHyun Choi
-	  added Korean translations for modemlights and wavelan plugin
-	  modified Korean translations for fsguard and sendsors plugin
+    * xfce4-fsguard-plugin/trunk/po/ko.po,
+      xfce4-modemlights-plugin/trunk/po/ko.po, po/ko.po,
+      xfce4-wavelan-plugin/trunk/po/ko.po: 11/03/2005: ByungHyun Choi
+      added Korean translations for modemlights and wavelan plugin
+      modified Korean translations for fsguard and sendsors plugin
 
 2005-10-15 10:28  timystery
 
-	* README, configure, configure.ac, icons/Makefile,
-	  panel-plugin/sensors.c: version 0.9.0 with hddtemp working with
-	  any device in /proc/ide with 2.4 kernels and most devices from
-	  /sys/block witch 3.6 kernels. support for bsd is planned, but
-	  yet unknown which direcories to look in.
+    * README, configure, configure.ac, icons/Makefile,
+      panel-plugin/sensors.c: version 0.9.0 with hddtemp working with
+      any device in /proc/ide with 2.4 kernels and most devices from
+      /sys/block witch 3.6 kernels. support for bsd is planned, but
+      yet unknown which direcories to look in.
 
 2005-10-14 14:55  timystery
 
-	* configure.ac: set version to 0.8.99 instead of pre0.9.0 as its
-	  still pretty untested.
+    * configure.ac: set version to 0.8.99 instead of pre0.9.0 as its
+      still pretty untested.
 
 2005-10-14 14:54  timystery
 
-	* po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: updated
-	  translations for hddtemp
+    * po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: updated
+      translations for hddtemp
 
 2005-10-14 14:53  timystery
 
-	* panel-plugin/sensors.c: working hddtemp
+    * panel-plugin/sensors.c: working hddtemp
 
 2005-10-14 13:29  timystery
 
-	* panel-plugin/sensors.c, panel-plugin/sensors.h: some more steps
-	  towards hdd temp values...
+    * panel-plugin/sensors.c, panel-plugin/sensors.h: some more steps
+      towards hdd temp values...
 
 2005-10-14 10:41  timystery
 
-	* icons/Makefile, panel-plugin/sensors.c, panel-plugin/sensors.h:
-	  compiling again with first hddtemp stuff in it.
+    * icons/Makefile, panel-plugin/sensors.c, panel-plugin/sensors.h:
+      compiling again with first hddtemp stuff in it.
 
 2005-10-11 20:20  timystery
 
-	* Makefile.in, aclocal.m4, configure, icons/Makefile,
-	  icons/Makefile.in, panel-plugin/Makefile.in,
-	  panel-plugin/sensors.c, panel-plugin/sensors.h: hddtemp
-	  extensions
+    * Makefile.in, aclocal.m4, configure, icons/Makefile,
+      icons/Makefile.in, panel-plugin/Makefile.in,
+      panel-plugin/sensors.c, panel-plugin/sensors.h: hddtemp
+      extensions
 
 2005-10-11 11:38  timystery
 
-	* configure, configure.ac, icons/Makefile: version 0.8.3 in
-	  configuration file now
+    * configure, configure.ac, icons/Makefile: version 0.8.3 in
+      configuration file now
 
 2005-10-11 11:30  timystery
 
-	* README, TODO, autogen.sh, panel-plugin/sensors.c: fixed bug:
-	  removing values from plugin wasn't saved properly autogen for
-	  xdt-autogen now.
+    * README, TODO, autogen.sh, panel-plugin/sensors.c: fixed bug:
+      removing values from plugin wasn't saved properly autogen for
+      xdt-autogen now.
 
 2005-10-09 13:58  timystery
 
-	* README, configure, configure.ac, icons/Makefile,
-	  panel-plugin/sensors.c: version 0.8.2 to fix the bug, that more
-	  than one column is displayed in vertical panel layout mode. so
-	  now it properly works.
+    * README, configure, configure.ac, icons/Makefile,
+      panel-plugin/sensors.c: version 0.8.2 to fix the bug, that more
+      than one column is displayed in vertical panel layout mode. so
+      now it properly works.
 
 2005-10-09 09:20  timystery
 
-	* po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po,
-	  po/xfce4-sensors-plugin.pot: updated german translation, but
-	  other translations were also affected by being updated to
-	  contain newest strings for translation.
+    * po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po,
+      po/xfce4-sensors-plugin.pot: updated german translation, but
+      other translations were also affected by being updated to
+      contain newest strings for translation.
 
 2005-10-08 13:36  timystery
 
-	* po/de.po: updated german tranlastaoit
+    * po/de.po: updated german tranlastaoit
 
 2005-10-08 13:33  timystery
 
-	* Makefile.in, aclocal.m4, configure, icons, icons/Makefile,
-	  icons/Makefile.am, icons/Makefile.in, icons/xfce-sensors.png,
-	  panel-plugin/Makefile.in,
-	  panel-plugin/xfce4-sensors-plugin.desktop.in.in, po/de.po,
-	  po/el.po, po/fr.po, po/ko.po, po/lt.po: neues icon zeug, desktop
-	  file eingetragen
+    * Makefile.in, aclocal.m4, configure, icons, icons/Makefile,
+      icons/Makefile.am, icons/Makefile.in, icons/xfce-sensors.png,
+      panel-plugin/Makefile.in,
+      panel-plugin/xfce4-sensors-plugin.desktop.in.in, po/de.po,
+      po/el.po, po/fr.po, po/ko.po, po/lt.po: neues icon zeug, desktop
+      file eingetragen
 
 2005-10-03 19:43  timystery
 
-	* po/de.gmo: delete unnnecessary gmo file from repositor
+    * po/de.gmo: delete unnnecessary gmo file from repositor
 
 2005-10-03 19:42  timystery
 
-	* Makefile.am, Makefile.in, configure, configure.ac: image icon
-	  now copied to 48er hicolor icon theme
+    * Makefile.am, Makefile.in, configure, configure.ac: image icon
+      now copied to 48er hicolor icon theme
 
 2005-10-03 14:50  timystery
 
-	* Makefile.am, Makefile.in, panel-plugin/Makefile.am,
-	  panel-plugin/Makefile.in: fully new version with working
-	  tranlsations, xdt-autogen and so on
+    * Makefile.am, Makefile.in, panel-plugin/Makefile.am,
+      panel-plugin/Makefile.in: fully new version with working
+      tranlsations, xdt-autogen and so on
 
 2005-10-03 14:26  timystery
 
-	* README, TODO, panel-plugin/Makefile.am, po/POTFILES.in,
-	  po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: .desktop and
-	  translation stuff
+    * README, TODO, panel-plugin/Makefile.am, po/POTFILES.in,
+      po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: .desktop and
+      translation stuff
 
 2005-10-03 14:12  timystery
 
-	* Makefile.am, Makefile.in, aclocal.m4, config.guess, config.h.in,
-	  config.sub, configure, configure.ac, ltmain.sh, mkinstalldirs,
-	  panel-plugin/Makefile.am, panel-plugin/Makefile.in,
-	  panel-plugin/sensors.c, panel-plugin/sensors.h,
-	  po/Makefile.in.in, po/POTFILES.in, po/de.po, po/el.po, po/fr.po,
-	  po/ko.po, po/lt.po, xfce-sensors.png: Version 0.8.0 for new
-	  panel 4.3.22 and higher. Pretty bug free (TM)
+    * Makefile.am, Makefile.in, aclocal.m4, config.guess, config.h.in,
+      config.sub, configure, configure.ac, ltmain.sh, mkinstalldirs,
+      panel-plugin/Makefile.am, panel-plugin/Makefile.in,
+      panel-plugin/sensors.c, panel-plugin/sensors.h,
+      po/Makefile.in.in, po/POTFILES.in, po/de.po, po/el.po, po/fr.po,
+      po/ko.po, po/lt.po, xfce-sensors.png: Version 0.8.0 for new
+      panel 4.3.22 and higher. Pretty bug free (TM)
 
 2005-09-18 16:30  stefan_ott
 
-	* panel-plugin/sensors.c: Removed some uncommented stuff
+    * panel-plugin/sensors.c: Removed some uncommented stuff
 
 2005-09-14 21:21  timystery
 
-	* panel-plugin/sensors.c: some more code cleanups, could already
-	  be regarded as 0.7.1, as it makes the optiosn dialog faster
+    * panel-plugin/sensors.c: some more code cleanups, could already
+      be regarded as 0.7.1, as it makes the optiosn dialog faster
 
 2005-09-14 21:08  timystery
 
-	* NEWS, README, configure, configure.ac, panel-plugin/sensors.c,
-	  panel-plugin/sensors.h, po/de.po, po/el.po, po/fr.po, po/ko.po,
-	  po/lt.po, po/xfce4-sensors-plugin.pot: new user interface for
-	  options dialog
+    * NEWS, README, configure, configure.ac, panel-plugin/sensors.c,
+      panel-plugin/sensors.h, po/de.po, po/el.po, po/fr.po, po/ko.po,
+      po/lt.po, po/xfce4-sensors-plugin.pot: new user interface for
+      options dialog
 
 2005-09-11 00:26  stefan_ott
 
-	* panel-plugin/sensors.c, panel-plugin/sensors.h: The scale is now
-	  an enum (+ some other small fixes)
+    * panel-plugin/sensors.c, panel-plugin/sensors.h: The scale is now
+      an enum (+ some other small fixes)
 
 2005-09-11 00:06  stefan_ott
 
-	* panel-plugin/sensors.c: Some more unit->scale transitions, fixed
-	  properties window size
+    * panel-plugin/sensors.c: Some more unit->scale transitions, fixed
+      properties window size
 
 2005-09-11 00:03  stefan_ott
 
-	* panel-plugin/sensors.c, panel-plugin/sensors.h: Renamed "unit"
-	  to "scale"
+    * panel-plugin/sensors.c, panel-plugin/sensors.h: Renamed "unit"
+      to "scale"
 
 2005-09-11 00:01  stefan_ott
 
-	* panel-plugin/sensors.c, panel-plugin/sensors.h: Added Fahrenheit
-	  option
+    * panel-plugin/sensors.c, panel-plugin/sensors.h: Added Fahrenheit
+      option
 
 2005-08-12 12:25  stefan_ott
 
-	* panel-plugin/sensors.c: Does not cause a segfault anymore when
-	  no sensors are found
+    * panel-plugin/sensors.c: Does not cause a segfault anymore when
+      no sensors are found
 
 2005-08-02 19:17  stefan_ott
 
-	* po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: Added new
-	  language lines
+    * po/de.po, po/el.po, po/fr.po, po/ko.po, po/lt.po: Added new
+      language lines
 
 2005-08-02 19:14  stefan_ott
 
-	* panel-plugin/sensors.c: Converted the UI checkbox to radio
-	  buttons
+    * panel-plugin/sensors.c: Converted the UI checkbox to radio
+      buttons
 
 2005-08-02 17:20  stefan_ott
 
-	* panel-plugin/sensors.c, panel-plugin/sensors.h: Renamed NewUI to
-	  BarUI
+    * panel-plugin/sensors.c, panel-plugin/sensors.h: Renamed NewUI to
+      BarUI
 
 2005-08-02 16:46  stefan_ott
 
-	* Makefile.in, aclocal.m4, compile, configure, depcomp,
-	  install-sh, missing, mkinstalldirs, panel-plugin/Makefile.in:
-	  Regenerated autoconf/automake files with new tests
+    * Makefile.in, aclocal.m4, compile, configure, depcomp,
+      install-sh, missing, mkinstalldirs, panel-plugin/Makefile.in:
+      Regenerated autoconf/automake files with new tests
 
 2005-08-02 15:05  stefan_ott
 
-	* panel-plugin/sensors.c: The panel is now updated correctly when
-	  options change
+    * panel-plugin/sensors.c: The panel is now updated correctly when
+      options change
 
 2005-08-02 14:57  stefan_ott
 
-	* aclocal.m4, configure, configure.ac: Upgraded panel dependency
-	  from 4.0.0 to 4.2.0
+    * aclocal.m4, configure, configure.ac: Upgraded panel dependency
+      from 4.0.0 to 4.2.0
 
 2005-08-01 07:45  timystery
 
-	* panel-plugin/sensors.c, po/de.po, po/el.po, po/fr.po, po/ko.po,
-	  po/lt.po, po/xfce4-sensors-plugin.pot: some more improvements
-	  concerning i18n
+    * panel-plugin/sensors.c, po/de.po, po/el.po, po/fr.po, po/ko.po,
+      po/lt.po, po/xfce4-sensors-plugin.pot: some more improvements
+      concerning i18n
 
 2005-08-01 07:35  timystery
 
-	* NEWS, README, configure.ac, panel-plugin/sensors.c, po/de.po,
-	  po/el.po, po/fr.po, po/ko.po, po/lt.po,
-	  po/xfce4-sensors-plugin.pot: found more translatable strings ;)
+    * NEWS, README, configure.ac, panel-plugin/sensors.c, po/de.po,
+      po/el.po, po/fr.po, po/ko.po, po/lt.po,
+      po/xfce4-sensors-plugin.pot: found more translatable strings ;)
 
 2005-07-31 16:09  timystery
 
-	* Makefile.in, aclocal.m4, compile, config.guess, config.h.in,
-	  config.sub, configure, configure.ac, depcomp, install-sh,
-	  ltmain.sh, missing, mkinstalldirs, panel-plugin/Makefile.am,
-	  panel-plugin/Makefile.in, po/de.po, po/el.po, po/fr.po,
-	  po/ko.po, po/lt.po, po/xfce4-sensors-plugin.pot: remode ja.po
-	  from targets, added sensors.h to targets
+    * Makefile.in, aclocal.m4, compile, config.guess, config.h.in,
+      config.sub, configure, configure.ac, depcomp, install-sh,
+      ltmain.sh, missing, mkinstalldirs, panel-plugin/Makefile.am,
+      panel-plugin/Makefile.in, po/de.po, po/el.po, po/fr.po,
+      po/ko.po, po/lt.po, po/xfce4-sensors-plugin.pot: remode ja.po
+      from targets, added sensors.h to targets
 
 2005-07-31 13:01  timystery
 
-	* NEWS, README, configure.ac: version number change, history in
-	  NEWS
+    * NEWS, README, configure.ac: version number change, history in
+      NEWS
 
 2005-07-31 12:54  timystery
 
-	* panel-plugin/sensors.h: exported structs and includes into this
-	  header file
+    * panel-plugin/sensors.h: exported structs and includes into this
+      header file
 
 2005-07-31 12:52  timystery
 
-	* panel-plugin/sensors.c, po/de.po, po/fr.po, po/ko.po,
-	  po/xfce4-sensors-plugin.pot: svn-commit.5.tmp
+    * panel-plugin/sensors.c, po/de.po, po/fr.po, po/ko.po,
+      po/xfce4-sensors-plugin.pot: svn-commit.5.tmp
 
 2005-07-30 20:10  stefan_ott
 
-	* panel-plugin/sensors.c: Implemented set_orientation
+    * panel-plugin/sensors.c: Implemented set_orientation
 
 2005-07-30 19:34  stefan_ott
 
-	* configure.ac: Added check for libsensors
+    * configure.ac: Added check for libsensors
 
 2005-07-30 19:27  stefan_ott
 
-	* panel-plugin/sensors.c: Introduced SENSORS and
-	  FEATURES_PER_SENSOR for more flexibility
+    * panel-plugin/sensors.c: Introduced SENSORS and
+      FEATURES_PER_SENSOR for more flexibility
 
 2005-07-30 19:21  stefan_ott
 
-	* panel-plugin/sensors.c: Properties-GUI elements are now enabled
-	  and disabled according to the current UI style
+    * panel-plugin/sensors.c: Properties-GUI elements are now enabled
+      and disabled according to the current UI style
 
 2005-07-30 19:02  stefan_ott
 
-	* Makefile.am, README, panel-plugin/Makefile.am,
-	  panel-plugin/Makefile.in: Synchronized some files with v0.5.1
+    * Makefile.am, README, panel-plugin/Makefile.am,
+      panel-plugin/Makefile.in: Synchronized some files with v0.5.1
 
 2005-07-29 19:18  stefan_ott
 
-	* po/de.po: Added new lines
+    * po/de.po: Added new lines
 
 2005-07-29 19:12  stefan_ott
 
-	* panel-plugin/sensors.c: Added new UI
+    * panel-plugin/sensors.c: Added new UI
 
 2005-07-28 12:25  p0llux
 
-	* configure.ac, po/el.po, po/fr.po, po/ja.po: add EL, FR and JA
-	  translations
+    * configure.ac, po/el.po, po/fr.po, po/ja.po: add EL, FR and JA
+      translations
 
 2005-06-16 08:53  timystery
 
-	* README, configure: Forgot to change version number in README
-	  added screenshot location to README
+    * README, configure: Forgot to change version number in README
+      added screenshot location to README
 
 2005-06-15 20:18  timystery
 
-	* configure.ac, panel-plugin/sensors.c, po/de.po, po/ko.po,
-	  po/xfce4-sensors-plugin.pot: Improved data visualization
+    * configure.ac, panel-plugin/sensors.c, po/de.po, po/ko.po,
+      po/xfce4-sensors-plugin.pot: Improved data visualization
 
 2005-06-15 18:17  timystery
 
-	* panel-plugin/sensors.c, po/de.po, po/ko.po,
-	  po/xfce4-sensors-plugin.pot: some more textual changes, sorry
-	  translators
+    * panel-plugin/sensors.c, po/de.po, po/ko.po,
+      po/xfce4-sensors-plugin.pot: some more textual changes, sorry
+      translators
 
 2005-06-15 18:09  timystery
 
-	* panel-plugin/sensors.c: successfully implemented and tested
-	  double-click improvement
+    * panel-plugin/sensors.c: successfully implemented and tested
+      double-click improvement
 
 2005-06-15 17:19  timystery
 
-	* configure.ac, panel-plugin/Makefile.am,
-	  panel-plugin/Makefile.in, panel-plugin/sensors.c: - uncommented
-	  double-click changes - removed -enable-dynamic from library-flags
+    * configure.ac, panel-plugin/Makefile.am,
+      panel-plugin/Makefile.in, panel-plugin/sensors.c: - uncommented
+      double-click changes - removed -enable-dynamic from library-flags
 
 2005-06-14 18:13  timystery
 
-	* README, panel-plugin/sensors.c: tried to add launch ommand
-	  ability
+    * README, panel-plugin/sensors.c: tried to add launch ommand
+      ability
 
 2005-02-13 12:56  p0llux
 
-	* configure.ac, po/lt.po: add LT translations
+    * configure.ac, po/lt.po: add LT translations
 
 2005-01-25 10:10  p0llux
 
-	* Makefile.in, aclocal.m4, compile, config.guess, config.sub,
-	  configure, configure.ac, install-sh, ltmain.sh,
-	  panel-plugin/Makefile.in, po/de.gmo, po/ko.po: add KO
-	  translations
+    * Makefile.in, aclocal.m4, compile, config.guess, config.sub,
+      configure, configure.ac, install-sh, ltmain.sh,
+      panel-plugin/Makefile.in, po/de.gmo, po/ko.po: add KO
+      translations
 
 2005-01-17 18:33  benny
 
-	* po/ChangeLog: Translators changelog.
+    * po/ChangeLog: Translators changelog.
 
 2004-12-31 12:17  timystery
 
-	* panel-plugin/sensors.c, po/de.po: removed gettext macros,
-	  included xfce-i18n header
+    * panel-plugin/sensors.c, po/de.po: removed gettext macros,
+      included xfce-i18n header
 
 2004-12-31 10:51  timystery
 
-	* panel-plugin/sensors.c, po/de.gmo, po/de.po,
-	  po/xfce4-sensors-plugin.pot: further gettext macros
+    * panel-plugin/sensors.c, po/de.gmo, po/de.po,
+      po/xfce4-sensors-plugin.pot: further gettext macros
 
 2004-12-31 10:42  timystery
 
-	* README, configure, configure.ac, po/de.gmo, po/de.po,
-	  po/xfce4-sensors-plugin.pot: added i18n macros to some strings
+    * README, configure, configure.ac, po/de.gmo, po/de.po,
+      po/xfce4-sensors-plugin.pot: added i18n macros to some strings
 
 2004-12-31 10:26  timystery
 
-	* ChangeLog, panel-plugin/sensors.c: added i18n macros to some
-	  strings
+    * ChangeLog, panel-plugin/sensors.c: added i18n macros to some
+      strings
 
 2004-12-29 22:49  timystery
 
-	* po/de.gmo: newly created file for german tranlation
+    * po/de.gmo: newly created file for german tranlation
 
 2004-12-29 22:48  timystery
 
-	* po/de.po: tranlated en -> de
+    * po/de.po: tranlated en -> de
 
 2004-12-28 19:42  benny
 
-	* ChangeLog, Makefile.am, Makefile.in, aclocal.m4, autogen.sh,
-	  config.h.in, configure, configure.ac, m4/glib-gettext.m4,
-	  mkinstalldirs, panel-plugin/Makefile.in, po, po/Makefile.in.in,
-	  po/POTFILES.in, po/de.gmo, po/de.po,
-	  po/xfce4-sensors-plugin.pot, xfce4-sensors-plugin.spec.in: Added
-	  i18n support. Added dist-bz2 and distcheck-bz2 targets. Updated
-	  spec file.
+    * ChangeLog, Makefile.am, Makefile.in, aclocal.m4, autogen.sh,
+      config.h.in, configure, configure.ac, m4/glib-gettext.m4,
+      mkinstalldirs, panel-plugin/Makefile.in, po, po/Makefile.in.in,
+      po/POTFILES.in, po/de.gmo, po/de.po,
+      po/xfce4-sensors-plugin.pot, xfce4-sensors-plugin.spec.in: Added
+      i18n support. Added dist-bz2 and distcheck-bz2 targets. Updated
+      spec file.
 
 2004-12-27 10:39  timystery
 
-	* ChangeLog, README, configure, panel-plugin/sensors.c: removed
-	  warnings, changed everything to version 0.3.1
+    * ChangeLog, README, configure, panel-plugin/sensors.c: removed
+      warnings, changed everything to version 0.3.1
 
 2004-12-27 09:46  benny
 
-	* xfce4-sensors-plugin.spec.in: Fix spec file.
+    * xfce4-sensors-plugin.spec.in: Fix spec file.
 
 2004-12-24 13:15  benny
 
-	* ChangeLog, Makefile.am, Makefile.in, NEWS, configure,
-	  configure.ac, xfce4-sensors-plugin.spec.in: Added missing files.
-	  Fixes.
+    * ChangeLog, Makefile.am, Makefile.in, NEWS, configure,
+      configure.ac, xfce4-sensors-plugin.spec.in: Added missing files.
+      Fixes.
 
 2004-12-24 12:49  benny
 
-	* AUTHORS, COPYING, INSTALL, Makefile.am, Makefile.in, README,
-	  TODO, aclocal.m4, autogen.sh, compile, config.guess,
-	  config.h.in, config.sub, configure, configure.ac, depcomp,
-	  install-sh, ltmain.sh, m4, m4/debug.m4, m4/depends.m4,
-	  m4/i18n.m4, m4/pkg.m4, missing, panel-plugin,
-	  panel-plugin/Makefile.am, panel-plugin/Makefile.in,
-	  panel-plugin/sensors.c: Initial revision
+    * AUTHORS, COPYING, INSTALL, Makefile.am, Makefile.in, README,
+      TODO, aclocal.m4, autogen.sh, compile, config.guess,
+      config.h.in, config.sub, configure, configure.ac, depcomp,
+      install-sh, ltmain.sh, m4, m4/debug.m4, m4/depends.m4,
+      m4/i18n.m4, m4/pkg.m4, missing, panel-plugin,
+      panel-plugin/Makefile.am, panel-plugin/Makefile.in,
+      panel-plugin/sensors.c: Initial revision
 
-2004-12-24 12:49  
+2004-12-24 12:49
 
-	* xfce4-sensors-plugin/branches, xfce4-sensors-plugin/tags, .: New
-	  repository initialized by cvs2svn.
+    * xfce4-sensors-plugin/branches, xfce4-sensors-plugin/tags, .: New
+      repository initialized by cvs2svn.
 

Modified: xfce4-sensors-plugin/trunk/configure.in.in
===================================================================
--- xfce4-sensors-plugin/trunk/configure.in.in	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/configure.in.in	2007-12-14 00:47:35 UTC (rev 3699)
@@ -6,7 +6,7 @@
 dnl 2007 Benedikt Meurer <benny at xfce.org>, Fabian Nowak <timystery at arcor.de>
 dnl
 
-m4_define([plugin_version],[0.10.99.3])
+m4_define([plugin_version],[0.10.99.4])
 
 AC_INIT([xfce4-sensors-plugin], [plugin_version], [timystery at arcor.de])
 AC_PREREQ([2.50])

Modified: xfce4-sensors-plugin/trunk/panel-plugin/acpi.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/acpi.h	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/acpi.h	2007-12-14 00:47:35 UTC (rev 3699)
@@ -29,7 +29,7 @@
 #define ACPI_FILE_BATTERY_INFO  "info"
 #define ACPI_FILE_FAN           "state"
 
-#define ACPI_INFO               "info"
+#define ACPI_INFO               "info_"
 
 #include <glib/garray.h>
 

Modified: xfce4-sensors-plugin/trunk/panel-plugin/hddtemp.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/hddtemp.c	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/hddtemp.c	2007-12-14 00:47:35 UTC (rev 3699)
@@ -275,53 +275,43 @@
 get_hddtemp_value (char* disk)
 {
     gchar *standard_output, *standard_error;
-    gchar *cmd_line;
+    gchar *cmd_line, *msg_text;
     gint exit_status=0;
     double value;
     gboolean result;
     GError *error;
-    gchar *argv [6];
 
     TRACE ("enters get_hddtemp_value for %s", disk);
 
-    // extern char **environ;
-
-    /*int i=0;
-    printf("environ\n");
-    while (environ[i]!=0) {
-        printf("%d: %s\n", i, environ[i]);
-        i++;
-    } */
-
     cmd_line = g_strdup_printf ( "%s -F -n -q %s", PATH_HDDTEMP, disk);
-    //cmd_line = g_strdup("/bin/cat /home/tim/test");
-    DBG  ("cmdline=%s\n", cmd_line);
 
-    argv[0] = "/home/tim/bin/hddtemp";
-    argv[1] = "-n";
-    argv[2] = "-q";
-    argv[3] = "-F";
-    argv[4] = disk;
-    argv[5] = NULL;
+    msg_text = NULL;
 
     error = NULL;
     result = g_spawn_command_line_sync ( (const gchar*) cmd_line,
             &standard_output, &standard_error, &exit_status, &error);
-    /*result = g_spawn_sync (NULL, argv, environ, G_SPAWN_FILE_AND_ARGV_ZERO, NULL, NULL, &standard_output, &standard_error, &exit_status, &error); */
- 
+
     /* filter those with no sensors out */
-    DBG  ("result=%d exit_status=%d disk=%s\n", result, exit_status, disk);
     if (exit_status==256 && access (PATH_HDDTEMP, X_OK)==0)
     {
-        quick_message ("\"hddtemp\" was not executed correctly, although it is "
-                       "executable. This is most probably due to the disks "
-                       "requiring root privileges to read their temperatures, "
-                       "and \"hddtemp\" not being setuid root.\n\n"
-                       "An easy but dirty solution is to run \"chmod u+s "
-                       PATH_HDDTEMP "\" as root user and restart this plugin "
-                       "or its panel.");
+        /* note that this check does only work for some versions of hddtmep. */
+        msg_text = g_strdup_printf(_("\"hddtemp\" was not executed correctly, "
+                        "although it is executable. This is most probably due "
+                        "to the disks requiring root privileges to read their "
+                        "temperatures, and \"hddtemp\" not being setuid root."
+                        "\n\n"
+                        "An easy but dirty solution is to run \"chmod u+s %s"
+                        "\" as root user and restart this plugin "
+                        "or its panel."), PATH_HDDTEMP);
+        quick_message (msg_text);
         value = ZERO_KELVIN;
     }
+    else if (strlen(standard_error)>0) {
+        msg_text = g_strdup_printf (_("An error occurred when executing"
+                                      " \"%s\":\n%s"), cmd_line, standard_error);
+        quick_message (msg_text);
+        value = ZERO_KELVIN;
+    }
     else if (error && (!result || exit_status!=0))
     {
         DBG  ("error %s\n", error->message);
@@ -332,13 +322,13 @@
         /* hddtemp does not return floating values, but only integer ones.
           So have an easier life with atoi.
           FIXME: Use strtod() instead?*/
-        DBG ("standard_output=%s\n", standard_output);
         value = (double) (atoi ( (const char*) standard_output) );
     }
 
     g_free (cmd_line);
     g_free (standard_output);
     g_free (standard_error);
+    g_free (msg_text);
 
     TRACE ("leaves get_hddtemp_value");
 

Modified: xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.c	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.c	2007-12-14 00:47:35 UTC (rev 3699)
@@ -34,9 +34,13 @@
 } */
 
 
-int sensors_get_feature_wrapper (const sensors_chip_name name, int number, double *value)
+int sensors_get_feature_wrapper (const sensors_chip_name *name, int number, double *value)
 {
-    return sensors_get_feature (name, number, value);
+    #if SENSORS_API_VERSION < 0x400 /* libsensors3 */
+        return sensors_get_feature (*name, number, value);
+    #else
+        return sensors_get_value (name, number, value);
+    #endif
 }
 
 
@@ -53,12 +57,32 @@
     chip->chip_name = (sensors_chip_name *) g_malloc (sizeof(sensors_chip_name));
     memcpy ( (void *) (chip->chip_name), (void *) name, sizeof(sensors_chip_name) );
 
-    chip->sensorId = g_strdup_printf ("%s-%x-%x", name->prefix, name->bus, name->addr);
+    #if SENSORS_API_VERSION < 0x400 /* libsensor 3 code */
+        chip->sensorId = g_strdup_printf ("%s-%x-%x", name->prefix, name->bus,
+                                            name->addr);
+    #else
+        switch (name->bus.type) {
+            case SENSORS_BUS_TYPE_I2C:
+            case SENSORS_BUS_TYPE_SPI:
+                chip->sensorId = g_strdup_printf ("%s-%x-%x", name->prefix,
+                                                    name->bus.nr, name->addr);
+                break;
+            default:
+                chip->sensorId = g_strdup_printf ("%s-%x", name->prefix,
+                                                    name->addr);
+        }
+    #endif
+
     chip->num_features=0;
     chip->name = _("LM Sensors");
     chip->chip_features = g_ptr_array_new();
 
-    chip->description = g_strdup (sensors_get_adapter_name (num_sensorchips-1));
+    #if SENSORS_API_VERSION < 0x400 /* libsensors3 */
+        chip->description = g_strdup (
+                                sensors_get_adapter_name (num_sensorchips-1));
+    #else
+        chip->description = g_strdup (sensors_get_adapter_name (&name->bus));
+    #endif
 
     TRACE ("leaves setup_chip");
 
@@ -66,25 +90,129 @@
 }
 
 
-void setup_chipfeature (t_chipfeature *chipfeature, int number, double sensorFeature)
+#if SENSORS_API_VERSION >= 0x400 /* libsensors4 */
+void
+categorize_sensor_type_libsensors4 (t_chipfeature *chipfeature,
+                                    const sensors_feature *feature,
+                                    const sensors_chip_name *name,
+                                    int number)
 {
-    TRACE ("enters setup_chipfeature");
+    const sensors_subfeature *sub_feature = NULL;
+    double sensorFeature;
 
+    switch (feature->type) {
+        case SENSORS_FEATURE_IN:
+            chipfeature->class = VOLTAGE;
+            chipfeature->min_value = 1.0;
+            chipfeature->max_value = 12.2;
+
+            if ((sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_IN_MIN)) &&
+                    !sensors_get_value (name, number, &sensorFeature))
+                chipfeature->min_value = sensorFeature;
+
+            if ((sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_IN_MAX)) &&
+                    !sensors_get_value (name, number, &sensorFeature))
+                chipfeature->max_value = sensorFeature;
+
+            break;
+
+        case SENSORS_FEATURE_FAN:
+            chipfeature->class = SPEED;
+            chipfeature->min_value = 1000.0;
+            chipfeature->max_value = 3500.0;
+
+            if ((sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_FAN_MIN)) &&
+                    !sensors_get_value (name, number, &sensorFeature))
+                chipfeature->min_value = sensorFeature;
+
+            break;
+
+        case SENSORS_FEATURE_TEMP:
+            chipfeature->class = TEMPERATURE;
+            chipfeature->min_value = 0.0;
+            chipfeature->max_value = 80.0;
+
+            if ((sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_TEMP_MIN)) &&
+                    !sensors_get_value (name, number, &sensorFeature))
+                chipfeature->min_value = sensorFeature;
+
+            if (((sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_TEMP_MAX)) ||
+                    (sub_feature = sensors_get_subfeature (name, feature,
+                    SENSORS_SUBFEATURE_TEMP_CRIT))) &&
+                    !sensors_get_value (name, number, &sensorFeature))
+                chipfeature->max_value = sensorFeature;
+            break;
+
+        case SENSORS_FEATURE_VID:
+            chipfeature->class = VOLTAGE;
+            chipfeature->min_value = 1.0;
+            chipfeature->max_value = 3.5;
+            break;
+
+        case SENSORS_FEATURE_BEEP_ENABLE:
+            chipfeature->class = STATE;
+            chipfeature->min_value = 1.0;
+            chipfeature->max_value = 3.5;
+            break;
+
+        default: /* UNKNOWN */
+            chipfeature->class = OTHER;
+            chipfeature->min_value = 0.0;
+            chipfeature->max_value = 7000.0;
+    }
+}
+#endif
+
+
+void setup_chipfeature_common (t_chipfeature *chipfeature, int number,
+                               double sensorFeature)
+{
     chipfeature->color = "#00B000";
     chipfeature->valid = TRUE;
-    g_free (chipfeature->formatted_value);
-    chipfeature->formatted_value = g_strdup_printf ("%+5.1f", sensorFeature);
+
     chipfeature->raw_value = sensorFeature;
     chipfeature->address = number;
     chipfeature->show = FALSE;
+}
 
+
+#if SENSORS_API_VERSION < 0x400 /* libsensors3 */
+void setup_chipfeature (t_chipfeature *chipfeature, int number,
+                        double sensorFeature)
+{
+    TRACE ("enters setup_chipfeature");
+
+    setup_chipfeature_common (chipfeature, number, sensorFeature);
+
+    /* g_free (chipfeature->formatted_value);
+    chipfeature->formatted_value = g_strdup_printf ("%+5.1f", sensorFeature); */
+
     categorize_sensor_type (chipfeature);
 
     TRACE ("leaves setup_chipfeature");
 }
+#else
+void setup_chipfeature_libsensors4 (t_chipfeature *chipfeature,
+                                    const sensors_feature *feature, int number,
+                                    double sensorFeature,
+                                    const sensors_chip_name *name)
+{
 
+    setup_chipfeature_common (chipfeature, number, sensorFeature);
 
-t_chipfeature *find_chipfeature    (const sensors_chip_name *name, t_chip *chip, int number)
+    categorize_sensor_type_libsensors4 (chipfeature, feature, name, number);
+}
+#endif
+
+
+#if SENSORS_API_VERSION < 0x400 /* libsensors3 */
+t_chipfeature *find_chipfeature (const sensors_chip_name *name, t_chip *chip,
+                                 int number)
 {
     int res;
     double sensorFeature;
@@ -99,8 +227,7 @@
         res = sensors_get_label (*(name), number, &(chipfeature->name));
 
         if (res==0) {
-            res = sensors_get_feature (*(name), number,
-                                        &sensorFeature);
+            res = sensors_get_feature (*(name), number, &sensorFeature);
 
             if (res==0) {
                 setup_chipfeature (chipfeature, number, sensorFeature);
@@ -111,19 +238,88 @@
         }
     }
 
+    g_free (chipfeature);
     TRACE ("leaves find_chipfeature with null");
-    g_free (chipfeature);
     return NULL;
 }
+#else
+t_chipfeature *find_chipfeature (const sensors_chip_name *name, t_chip *chip,
+                                 const sensors_feature *feature)
+{
+    const sensors_subfeature *sub_feature = NULL;
+    int res, number = -1;
+    double sensorFeature;
+    t_chipfeature *chipfeature;
 
+    TRACE ("enters find_chipfeature");
 
+    switch (feature->type) {
+        case SENSORS_FEATURE_IN:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                  SENSORS_SUBFEATURE_IN_INPUT);
+            break;
+        case SENSORS_FEATURE_FAN:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                 SENSORS_SUBFEATURE_FAN_INPUT);
+            break;
+        case SENSORS_FEATURE_TEMP:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                 SENSORS_SUBFEATURE_TEMP_INPUT);
+            break;
+        case SENSORS_FEATURE_VID:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                 SENSORS_SUBFEATURE_VID);
+            break;
+        case SENSORS_FEATURE_BEEP_ENABLE:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                 SENSORS_SUBFEATURE_BEEP_ENABLE);
+            break;
+        default:
+            sub_feature = sensors_get_subfeature (name, feature,
+                                                  SENSORS_SUBFEATURE_UNKNOWN);
+    }
+    if (sub_feature)
+        number = sub_feature->number;
+
+    if (number==-1)
+        return NULL;
+
+    chipfeature = g_new0 (t_chipfeature, 1);
+
+    chipfeature->name = sensors_get_label (name, feature);
+
+    if (!chipfeature->name)
+        chipfeature->name = feature->name;
+
+    if (chipfeature->name)
+    {
+        res = sensors_get_value (name, number, &sensorFeature);
+        if (res==0)
+        {
+            setup_chipfeature_libsensors4 (chipfeature, feature, number,
+                                           sensorFeature, name);
+            chip->num_features++;
+            TRACE("leaves find_chipfeature");
+            return chipfeature;
+        }
+    }
+
+    g_free(chipfeature);
+
+    TRACE("leaves find_chipfeature with null");
+    return NULL;
+}
+#endif
+
+
 int initialize_libsensors (GPtrArray *chips)
 {
     int sensorsInit, nr1, nr2, num_sensorchips; /*    , numchips;  */
     t_chip *chip;
     t_chipfeature *chipfeature; /* , *furtherchipfeature; */
+    const sensors_chip_name *detected_chip;
+#if SENSORS_API_VERSION < 0x400 /* libsensors3 */
     FILE *file;
-    const sensors_chip_name *detected_chip;
     const sensors_feature_data *sfd;
 
     TRACE("enters initialize_libsensors");
@@ -176,9 +372,47 @@
         TRACE ("leaves initialize_libsensors with -1");
         return -1;
     }
+#else
+    const sensors_feature *sfd;
+    TRACE("enters initialize_libsensors");
+
+    sensorsInit = sensors_init (NULL);
+    if (sensorsInit != 0)
+    {
+        g_printf(_("Error: Could not connect to sensors!"));
+        /* FIXME: better popup window? write to special logfile? */
+        return -2;
+    }
+
+    num_sensorchips = 0;
+    detected_chip = sensors_get_detected_chips (NULL, &num_sensorchips);
+    /* iterate over chips on mainboard */
+    while (detected_chip!=NULL)
+    {
+        chip = setup_chip (chips, detected_chip, num_sensorchips);
+
+        nr1 = 0;
+        nr2 = 0;
+        /* iterate over chip features, i.e. id, cpu temp, mb temp... */
+        /* numchips = get_number_chip_features (detected_chip); */
+        sfd = sensors_get_features (detected_chip, &nr1);
+        while (sfd != NULL)
+        {
+            chipfeature = find_chipfeature (detected_chip, chip, sfd);
+            if (chipfeature!=NULL) {
+                g_ptr_array_add (chip->chip_features, chipfeature);
+            }
+            sfd = sensors_get_features (detected_chip, &nr1);
+        }
+
+        detected_chip = sensors_get_detected_chips (NULL, &num_sensorchips);
+    } /* end while sensor chipNames */
+
+    TRACE ("leaves initialize_libsensors with 1");
+    return 1;
+#endif
 }
 
-
 void
 refresh_lmsensors (gpointer chip_feature, gpointer data)
 {
@@ -192,3 +426,19 @@
 
     TRACE ("leaves refresh_lmsensors");
 }
+
+void
+free_lmsensors_chip (gpointer chip)
+{
+    t_chip *c;
+
+    c = (t_chip *) chip;
+
+    g_free (c->name);
+    g_free (c->chip_name->prefix);
+
+    #if SENSORS_API_VERSION < 0x400
+        g_free (c->chip_name->busname);
+    #endif
+
+}

Modified: xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.h	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/lmsensors.h	2007-12-14 00:47:35 UTC (rev 3699)
@@ -26,6 +26,19 @@
  * @Param value: pointer where the double feature value is to be stored
  * @Return: 0 on success
  */
-int sensors_get_feature_wrapper (const sensors_chip_name name, int number, double *value);
+int sensors_get_feature_wrapper (const sensors_chip_name *name, int number,
+                                 double *value);
 
+/*
+ * Free the additionally allocated structures in the sensors_chip_name
+ * according to the version of libsensors.
+ * @Param chip: Pointer to t_chip
+ */
+void free_lmsensors_chip (gpointer chip);
+
+
+void
+categorize_lmsensors_type (t_chipfeature *chipfeature,
+                           sensors_feature *feature);
+
 #endif /* XFCE4_SENSORS_LMSENSORS_H */

Modified: xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.c	2007-12-14 00:47:35 UTC (rev 3699)
@@ -119,36 +119,35 @@
 {
     TRACE ("enters categorize_sensor_type");
 
-    /* categorize sensor type */
-   if ( strstr(chipfeature->name, "Temp")!=NULL
+    if ( strstr(chipfeature->name, "Temp")!=NULL
     || strstr(chipfeature->name, "temp")!=NULL ) {
-         chipfeature->class = TEMPERATURE;
-         chipfeature->min_value = 0.0;
-         chipfeature->max_value = 80.0;
-   } else if ( strstr(chipfeature->name, "VCore")!=NULL
-      || strstr(chipfeature->name, "3V")!=NULL
-      || strstr(chipfeature->name, "5V")!=NULL
-      || strstr(chipfeature->name, "12V")!=NULL ) {
-         chipfeature->class = VOLTAGE;
-         chipfeature->min_value = 2.8;
-         chipfeature->max_value = 12.2;
-   } else if ( strstr(chipfeature->name, "Fan")!=NULL
-      || strstr(chipfeature->name, "fan")!=NULL ) {
-         chipfeature->class = SPEED;
-         chipfeature->min_value = 1000.0;
-         chipfeature->max_value = 3500.0;
-   } else if ( strstr(chipfeature->name, "alarm")!=NULL
-      || strstr(chipfeature->name, "Alarm")!=NULL ) {
-         chipfeature->class = STATE;
-         chipfeature->min_value = 0.0;
-         chipfeature->max_value = 1.0;
-   } else {
-         chipfeature->class = OTHER;
-         chipfeature->min_value = 0.0;
-         chipfeature->max_value = 7000.0;
-   }
+        chipfeature->class = TEMPERATURE;
+        chipfeature->min_value = 0.0;
+        chipfeature->max_value = 80.0;
+    } else if ( strstr(chipfeature->name, "VCore")!=NULL
+    || strstr(chipfeature->name, "3V")!=NULL
+    || strstr(chipfeature->name, "5V")!=NULL
+    || strstr(chipfeature->name, "12V")!=NULL ) {
+        chipfeature->class = VOLTAGE;
+        chipfeature->min_value = 1.0;
+        chipfeature->max_value = 12.2;
+    } else if ( strstr(chipfeature->name, "Fan")!=NULL
+    || strstr(chipfeature->name, "fan")!=NULL ) {
+        chipfeature->class = SPEED;
+        chipfeature->min_value = 1000.0;
+        chipfeature->max_value = 3500.0;
+    } else if ( strstr(chipfeature->name, "alarm")!=NULL
+    || strstr(chipfeature->name, "Alarm")!=NULL ) {
+        chipfeature->class = STATE;
+        chipfeature->min_value = 0.0;
+        chipfeature->max_value = 1.0;
+    } else {
+        chipfeature->class = OTHER;
+        chipfeature->min_value = 0.0;
+        chipfeature->max_value = 7000.0;
+    }
 
-   TRACE ("leaves categorize_sensor_type");
+    TRACE ("leaves categorize_sensor_type");
 }
 
 
@@ -162,7 +161,7 @@
 
     if (chip->type==LMSENSOR ) {
         #ifdef HAVE_LIBSENSORS
-            return sensors_get_feature_wrapper (*(chip->chip_name), number, value);
+            return sensors_get_feature_wrapper (chip->chip_name, number, value);
         #else
             return -1;
         #endif
@@ -218,13 +217,11 @@
 {
     t_chip *c;
     c = (t_chip *) chip;
-    if (c->type==LMSENSOR)
-        g_free (c->name);
+
     g_free (c->sensorId);
     g_free (c->description);
     if (c->type==LMSENSOR) {
-        g_free (c->chip_name->prefix);
-        g_free (c->chip_name->busname);
+        free_lmsensors_chip (chip);
     }
     /* g_free (c->chip_name); */   /* is a _copied_ structure of libsensors */
     g_ptr_array_foreach (c->chip_features, free_chipfeature, NULL);

Modified: xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/middlelayer.h	2007-12-14 00:47:35 UTC (rev 3699)
@@ -63,7 +63,7 @@
  * Classifies sensor type
  * @Param: Pointer to feature
  */
-void categorize_sensor_type (t_chipfeature* chipfeature);
+void categorize_sensor_type (t_chipfeature *chipfeature);
 
 
 /* Gets value of specified number in chip_name

Modified: xfce4-sensors-plugin/trunk/panel-plugin/sensors.c
===================================================================
--- xfce4-sensors-plugin/trunk/panel-plugin/sensors.c	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/panel-plugin/sensors.c	2007-12-14 00:47:35 UTC (rev 3699)
@@ -131,8 +131,10 @@
                 panel = (t_barpanel*) sensors->panels[chipNum][feature];
 
                 gtk_widget_destroy (panel->progressbar);
-                gtk_widget_destroy (panel->label);
                 gtk_widget_destroy (panel->databox);
+                if (sensors->show_labels == TRUE)
+                    gtk_widget_destroy (panel->label);
+
                 g_free (panel);
             }
         }

Modified: xfce4-sensors-plugin/trunk/po/de.po
===================================================================
--- xfce4-sensors-plugin/trunk/po/de.po	2007-12-10 18:24:39 UTC (rev 3698)
+++ xfce4-sensors-plugin/trunk/po/de.po	2007-12-14 00:47:35 UTC (rev 3699)
@@ -237,6 +237,29 @@
 msgid "Show sensor values."
 msgstr "Sensorwerte erkannter Sensoren überwachen."
 
+#~ msgid ""
+#~ "\"hddtemp\" was not executed correctly, although it is executable. This "
+#~ "is most probably due to the disks requiring root privileges to read their "
+#~ "temperatures, and \"hddtemp\" not being setuid root.\n"
+#~ "\n"
+#~ "An easy but dirty solution is to run \"chmod u+s %s\" as root user and "
+#~ "restart this plugin or its panel."
+#~ msgstr ""
+#~ "»hddtemp« wurde nicht ordnungsgemäß ausgeführt, obwohl es ausfühbar ist. "
+#~ "Dies liegt wahrscheinlich daran, dass zum Auslesen der "
+#~ "Festplatteninformation die Rechte des Supernutzers nötig sind, bei "
+#~ "»hddtemp« aber nicht das Setuid-Bit gesetzt ist.\n"
+#~ "\n"
+#~ "Eine einfache aber unsaubere Lösung ist, »chmod u+s %s« als Supernutzer "
+#~ "auszuführen und das Plugin oder die Leiste neuzustarten."
+
+#~ msgid ""
+#~ "An error occurred when executing \"%s\":\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ein Fehler hat sich beim Ausführen von »%s« ereignet:\n"
+#~ "%s"
+
 #~ msgid "Advanced Configuration and Power Interface"
 #~ msgstr "Erweiterte Konfigurations- und Stromschnittstelle"
 




More information about the Goodies-commits mailing list