hal/hald/linux bus_device.c,1.12,1.13 class_device.c,1.17,1.18

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv14095/hald/linux

Modified Files:
	bus_device.c class_device.c 
Log Message:
2004-07-06  David Zeuthen  <david at fubar.dk>

	* hald/linux/bus_device.c (bus_device_move_from_tdl_to_gdl): Removed
	the wrong handler so on remove this was called and the device was
	added to the GDL again. Resulting in the device was never removed.

	* hald/linux/class_device.c (class_device_move_from_tdl_to_gdl): 
	Same as above



Index: bus_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/bus_device.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- bus_device.c	5 Jul 2004 18:21:07 -0000	1.12
+++ bus_device.c	6 Jul 2004 17:03:48 -0000	1.13
@@ -150,7 +150,7 @@
 	hal_device_store_remove (hald_get_tdl (), device);
 	hal_device_store_add (hald_get_gdl (), device);
 	g_signal_handlers_disconnect_by_func (device,
-					      device_move_from_tdl_to_gdl,
+					      bus_device_move_from_tdl_to_gdl,
 					      user_data);
 	g_object_unref (device);
 

Index: class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/class_device.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- class_device.c	5 Jul 2004 18:21:07 -0000	1.17
+++ class_device.c	6 Jul 2004 17:03:48 -0000	1.18
@@ -410,7 +410,7 @@
 	hal_device_store_remove (hald_get_tdl (), device);
 	hal_device_store_add (hald_get_gdl (), device);
 	g_signal_handlers_disconnect_by_func (device,
-					      device_move_from_tdl_to_gdl,
+					      class_device_move_from_tdl_to_gdl,
 					      user_data);
 	g_object_unref (device);