hal: Branch 'master'

[Artem Kachitchkine]

 hald/hald_dbus.c |    6 ++++--
 hald/util.c      |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
diff-tree 69c484855863eeee21aa6cadd5062bcfbff17ded (from 02e3526e5b84ba1981bc6df31a152557d01b890a)
Author: Artem Kachitchkine <artem.kachitchkin at sun.com>
Date:   Thu Oct 12 09:41:06 2006 -0700

    fix minor memory leaks
    
    fix minor memory leaks

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index f8901f8..32b5503 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -2924,8 +2924,10 @@ hald_exec_method_enqueue (MethodInvocati
 	GList *queue;
 
 	if (udi_to_method_queue == NULL) {
-		udi_to_method_queue = g_hash_table_new (g_str_hash,
-							g_str_equal);
+		udi_to_method_queue = g_hash_table_new_full (g_str_hash,
+							     g_str_equal,
+							     g_free,
+							     NULL);
 	}
 
 	if (g_hash_table_lookup_extended (udi_to_method_queue, mi->udi, &origkey, (gpointer) &queue)) {
diff --git a/hald/util.c b/hald/util.c
index 28ac97b..9ff42c3 100644
--- a/hald/util.c
+++ b/hald/util.c
@@ -1075,6 +1075,8 @@ hal_util_is_mounted_by_hald (const char 
 		g_strfreev (line_elements);
 	}
 
+	g_strfreev (lines);
+
 out:
 	if (hal_mtab != NULL)
 		fclose (hal_mtab);