hal: Branch 'master'

[Kay Sievers]

 hald/hald_dbus.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit aec7c567419a1b8c33be1d08f962eea31a53e317
Author: Andrey Borzenkov <arvidjaar at mail.ru>
Date:   Tue Jul 14 21:34:07 2009 +0200

    work aroud crash caused by LED device handling
    
    During suspend led device is removed; during resume it is recreated.
    Apparently removing led device cause hald-addon- leds to exit
    (thus disconnecting D-Bus connection); and sometimes next "add" event
    comes too early, before hald had chance to notice missing addon.
    
    Adds extra check to hald_singleton_device_added() to ensure we do not
    abort on disconnected D-Bus connection.

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index c0cb8c2..adc2bc6 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3476,7 +3476,7 @@ singleton_signal_device_changed (DBusConnection *connection, HalDevice *device,
 	if (dbus_connection_send_with_reply (connection,
 					     message,
 					     &pending_call,
-					     /*-1*/ 8000)) {
+					     /*-1*/ 8000) && pending_call) {
 		/*HAL_INFO (("connection=%x message=%x", connection, message));*/
 		dbus_pending_call_set_notify (pending_call,
 					      reply_from_singleton_device_changed,