[PATCH] wait for the reply of dbus-send so we ensure it ran

[Richard Hughes]

In http://lists.freedesktop.org/archives/dbus/2008-March/009526.html Michael Meeks discusses
how sometimes dbus-send can have it's method ignored in some circumstances when not uesd with
--print-reply (so it waits with for the method to be executed).

Until we get a fixed DBUS in distros, we should do this fix as it's probably a good idea anyway.
---
 pm/sleep.d/55NetworkManager |    6 ++++--
 pm/sleep.d/55battery        |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pm/sleep.d/55NetworkManager b/pm/sleep.d/55NetworkManager
index 244e2c7..d2f3593 100755
--- a/pm/sleep.d/55NetworkManager
+++ b/pm/sleep.d/55NetworkManager
@@ -13,7 +13,8 @@ command_exists dbus-send || exit $NA
 suspend_nm()
 {
 	# Tell NetworkManager to shut down networking
-	dbus-send --system                         \
+	dbus-send --system                             \
+		--type=method_call --print-reply       \
 		--dest=org.freedesktop.NetworkManager  \
 		/org/freedesktop/NetworkManager        \
 		org.freedesktop.NetworkManager.sleep
@@ -22,7 +23,8 @@ suspend_nm()
 resume_nm()
 {
 	# Wake up NetworkManager and make it do a new connection
-	dbus-send --system                        \
+	dbus-send --system                            \
+		--type=method_call --print-reply      \
 		--dest=org.freedesktop.NetworkManager \
 		/org/freedesktop/NetworkManager       \
 		org.freedesktop.NetworkManager.wake
diff --git a/pm/sleep.d/55battery b/pm/sleep.d/55battery
index 1944e98..20a68ca 100755
--- a/pm/sleep.d/55battery
+++ b/pm/sleep.d/55battery
@@ -7,8 +7,9 @@
 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" \
+		dbus-send --system --reply-timeout=2000  \
+			--type=method_call --print-reply \
+			--dest=org.freedesktop.Hal "$x"  \
 			org.freedesktop.Hal.Device.Rescan "string:$x"
 	done
 }
-- 
1.5.5.1


--=-rSAv3r6K2HC4ynjy6OT5--