hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
diff-tree 9d447fd35831485cff998be16a922bf2683688f5 (from parents)
Merge: 30855b8049123a948bb91515f3221683d3f9b3da adeac81114edea79b7188b496c8862e5ec7162c9
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jul 3 12:54:51 2007 +0200

    Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal

diff-tree 30855b8049123a948bb91515f3221683d3f9b3da (from bed20e91b52fbea7f48f239c7d1283952d17afd9)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Jul 3 12:53:33 2007 +0200

    fix usage of g_list_free1() to fit HAL requirements
    
    This replace usage of g_list_free1() with g_list_free_1() to fit the
    current HAL requirements for glib version >= 2.6.0. As it look to
    me g_list_free1() was e.g. not part of 2.6.8 and is also only a
    redefine of g_list_free_1().

diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c
index fb37eaf..95e803c 100644
--- a/hald/hald_dbus.c
+++ b/hald/hald_dbus.c
@@ -3466,7 +3466,7 @@ hald_singleton_device_removed (const cha
 	}
 
 	info->devices = g_list_remove_link (info->devices, lp);
-	g_list_free1 (lp);
+	g_list_free_1 (lp);
 
 	if (G_LIKELY (info->connection)) {
 		singleton_signal_device_changed (info->connection, device, FALSE);