[Pm-utils] [PATCH 04/12] Proposed pm-utils 1.2.3 patches, take 2

[Victor Lowther]

Remove 55battery

HAL has handled rescanning the batteries since mid 2006.
---
 pm/sleep.d/55battery   |   20 --------------------
 pm/sleep.d/Makefile.am |    1 -
 2 files changed, 0 insertions(+), 21 deletions(-)

diff --git a/pm/sleep.d/55battery b/pm/sleep.d/55battery
deleted file mode 100755
index f41e4af..0000000
--- a/pm/sleep.d/55battery
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# Have HAL rescan batteries on resume.
-# TODO: Merge this code back into HAL, it should not be in pm-utils.
-
-. "${PM_FUNCTIONS}"
-
-resume_batteries()
-{
-	for x in $(hal-find-by-capability --capability battery 2>/dev/null); do
-		dbus_send --system --reply-timeout=2000 \
-			--dest=org.freedesktop.Hal "$x" \
-			org.freedesktop.Hal.Device.Rescan "string:$x"
-	done
-}
-
-case "$1" in
-	resume|thaw)
-		resume_batteries
-		;;
-esac
diff --git a/pm/sleep.d/Makefile.am b/pm/sleep.d/Makefile.am
index 2972d20..960a7b5 100644
--- a/pm/sleep.d/Makefile.am
+++ b/pm/sleep.d/Makefile.am
@@ -7,7 +7,6 @@ sleep_SCRIPTS =			\
 	01grub			\
 	49bluetooth		\
 	50ntpd			\
-	55battery		\
 	55NetworkManager	\
 	65alsa			\
 	75modules		\
-- 
1.6.0.4