hal: Branch 'master'

[David Zeuthen]

 hald/hald_dbus.c |    5 +++++
 1 files changed, 5 insertions(+)

New commits:
diff-tree 1ec650992778070c7724d14fa83a7f95450e9e0d (from 48e9e8ad6001521ff171451ddac3c47fa2499d1e)
Author: Sergey Lapin <slapinid at gmail.com>
Date:   Mon Dec 4 13:46:51 2006 -0500

    fix for crash in hald_dbus.c
    
    hald crashed on ARM within glib.

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index 7434230..0608660 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -2898,6 +2898,10 @@ device_is_executing_method (HalDevice *d
 
 	ret = FALSE;
 
+	if (udi_to_method_queue == NULL) {
+		goto out;
+	}
+
 	if (g_hash_table_lookup_extended (udi_to_method_queue, hal_device_get_udi (d), &origkey, (gpointer) &queue)) {
 
 		if (queue != NULL) {
@@ -2911,6 +2915,7 @@ device_is_executing_method (HalDevice *d
 
 		ret = TRUE;
 	}
+out:
 	return ret;
 }