hal: Branch 'master'

[Richard Hughes]

 hald/device_pm.c |    4 ++--
 hald/device_pm.h |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
diff-tree 075ca0f6df9893f972b045771ae703e95cf3f6de (from ac8cd419764f9131f7972e064ab1f84112e06817)
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jul 4 18:13:29 2007 +0100

    fix some warnings in the device_pm code
    
    Fix a couple of warnings for unused variables, and include all the correct headers.
    No code changes.

diff --git a/hald/device_pm.c b/hald/device_pm.c
index f48fccb..e84c4ff 100644
--- a/hald/device_pm.c
+++ b/hald/device_pm.c
@@ -33,6 +33,8 @@
 #include <glib.h>
 
 #include "logger.h"
+#include "util_pm.h"
+#include "device_pm.h"
 #include "device_store.h"
 
 /** 
@@ -54,8 +56,6 @@ device_pm_abstract_props (HalDevice *d)
 	int normalised_rate;
 	int design_voltage;
 	int voltage;
-	int remaining_time;
-	int remaining_percentage;
 	gboolean charging;
 	gboolean discharging;
 
diff --git a/hald/device_pm.h b/hald/device_pm.h
index 80d729a..1b60604 100644
--- a/hald/device_pm.h
+++ b/hald/device_pm.h
@@ -26,6 +26,8 @@
 #ifndef DEVICE_PM_H
 #define DEVICE_PM_H
 
+#include "device.h"
+
 void device_pm_remove_optional_props (HalDevice *d);
 void device_pm_abstract_props (HalDevice *d);
 void device_pm_calculate_percentage (HalDevice *d);