Updating branch refs/heads/master
to 6df0bc03dfdad6cbb096958d6fad132da80d03bd (commit)
from a339539f2705f04feac7694674be5ef46bdeaf4c (commit)
commit 6df0bc03dfdad6cbb096958d6fad132da80d03bd
Author: Fabian <timyst...@arcor.de>
Date: Mon May 2 22:12:35 2011 +0200
- apply several patches from bug reports
- copyright years
- make enable-debug compile again
TODO | 2 ++
configure.in.in | 9 ++++++---
lib/libxfce4sensors-1.0.pc.in | 2 +-
lib/middlelayer.c | 2 ++
lib/sensors-interface-common.c | 3 ++-
5 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/TODO b/TODO
index 71f0cae..35dd861 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,8 @@
TODO
======
+- adjust RPM spec file to check for libxfce4ui etc.? or does checking for the
panel suffice?
+
- Use notfication messages when alert is on; when maximum is reached.
- fix error: doesn't find all sensors when newly adding plugin to panel -
sensors library problem?
diff --git a/configure.in.in b/configure.in.in
index c91f784..a87bcdb 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -3,8 +3,8 @@ dnl configure.in.in
dnl
dnl xfce4-sensors-plugin - Sensors plugin for xfce4-panel
dnl
-dnl 2003,2004 Benedikt Meurer <be...@xfce.org>
-dnl 2007 Benedikt Meurer <be...@xfce.org>, Fabian Nowak <timyst...@arcor.de>
+dnl 2003,2004, 2007 Benedikt Meurer <be...@xfce.org>
+dnl 2007-2011 Fabian Nowak <timyst...@arcor.de>
dnl
m4_define([libxfce4sensors_verinfo], [1:0:1])
@@ -36,7 +36,10 @@ dnl Check for basic programs
AC_PROG_CC
AC_PROG_LD
AC_PROG_INSTALL
-AC_PROG_LIBTOOL
+
+LT_PREREQ([2.2.6])
+LT_INIT([disable-static])
+dnl AC_PROG_LIBTOOL
AC_PROG_INTLTOOL
dnl ****************************
diff --git a/lib/libxfce4sensors-1.0.pc.in b/lib/libxfce4sensors-1.0.pc.in
index 74f52e9..d004839 100644
--- a/lib/libxfce4sensors-1.0.pc.in
+++ b/lib/libxfce4sensors-1.0.pc.in
@@ -9,7 +9,7 @@ datarootdir=@datarootdir@
Name: libxfce4sensors
Description: Library for the Xfce 4 Sensors Plugin and Viewer
-Requires: libxfce4util-1.0 libxfcegui4-1.0
+Requires: libxfce4util-1.0 libxfce4ui-1
Version: @PACKAGE_VERSION@
Libs: -L${libdir} -lxfce4sensors
Cflags: -I${includedir}/xfce4/
diff --git a/lib/middlelayer.c b/lib/middlelayer.c
index baab393..cf2e281 100644
--- a/lib/middlelayer.c
+++ b/lib/middlelayer.c
@@ -181,7 +181,9 @@ int
sensor_get_value (t_chip *chip, int number, double *value, gboolean
*suppressmessage)
{
t_chipfeature *feature;
+ #ifdef HAVE_HDDTEMP
gboolean *suppress = suppressmessage;
+ #endif
/* TRACE ("enters sensor_get_value %d", number); */
g_assert (chip!=NULL);
diff --git a/lib/sensors-interface-common.c b/lib/sensors-interface-common.c
index b3e2234..f3480d8 100644
--- a/lib/sensors-interface-common.c
+++ b/lib/sensors-interface-common.c
@@ -43,7 +43,7 @@ sensors_new (XfcePanelPlugin *plugin, gchar
*plugin_config_file)
TRACE ("enters sensors_new");
- sensors = g_new (t_sensors, 1);
+ sensors = g_new0 (t_sensors, 1);
sensors->plugin_config_file = plugin_config_file; /* important as we check
against NULL frequently */
/* init xfce sensors stuff width default values */
@@ -69,6 +69,7 @@ sensors_new (XfcePanelPlugin *plugin, gchar
*plugin_config_file)
chipfeature->address = 0;
chip->sensorId = g_strdup(_("No sensors found!"));
+ chip->description = g_strdup(_("No sensors found!"));
chip->num_features = 1;
chipfeature->color = g_strdup("#000000");
/* g_free (chipfeature->name); */
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
