hal/hald callout.c,1.7,1.8 hald.c,1.3,1.4

[David Zeuthen]

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

Modified Files:
	callout.c hald.c 
Log Message:
2004-04-21  David Zeuthen  <david at fubar.dk>

	* hald/callout.c
	(hal_callout_property): callouts seem to be a bit broken right 
	now (segfaults my box etc.), so disable them. Hopefully this is
	fixed soon!
	(hal_callout_capability): -do-
	(hal_callout_device): -do

	* hald/linux/usbif_bus_device.c (usbif_device_compute_udi): Don't
	print details about the device

	* hald/linux/usb_bus_device.c (usb_proc_parse): Comment out noisy
	print statements

	* hald/linux/osspec.c 
	(handle_udev_node_created_found_device): 
	(visit_class_device): clean up logging statements
	(visit_device): -do-
	(remove_device): comment out noisy logging statements
	(remove_class_device): -do-
	(handle_hotplug): -do-


	* hald/linux/class_device.c 
	(class_device_got_device_file): comment out noisy logging statement
	(class_device_accept): -do-

	* hald/linux/common.c 
	(rename_and_merge): comment out noisy logging statements
	(class_device_get_device_file): -do-

	* hald/hald.c (gdl_store_changed): don't print device, just print
	the UDI



Index: callout.c
===================================================================
RCS file: /cvs/hal/hal/hald/callout.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/callout.c	21 Apr 2004 15:20:09 -0000	1.7
+++ b/callout.c	21 Apr 2004 18:44:41 -0000	1.8
@@ -176,6 +176,9 @@
 	GError *err = NULL;
 	const char *filename;
 
+	/* XXX */
+	return;
+
 	/* Directory doesn't exist.  This isn't an error, just exit
 	 * quietly. */
 	if (!g_file_test (DEVICE_CALLOUT_DIR, G_FILE_TEST_EXISTS))
@@ -237,6 +240,10 @@
 	GError *err = NULL;
 	const char *filename;
 
+	/* XXX */
+	return;
+
+
 	/* Directory doesn't exist.  This isn't an error, just exit
 	 * quietly. */
 	if (!g_file_test (CAPABILITY_CALLOUT_DIR, G_FILE_TEST_EXISTS))
@@ -300,6 +307,10 @@
 	GError *err = NULL;
 	const char *filename;
 
+	/* XXX */
+	return;
+
+
 	/* Directory doesn't exist.  This isn't an error, just exit
 	 * quietly. */
 	if (!g_file_test (PROPERTY_CALLOUT_DIR, G_FILE_TEST_EXISTS))

Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/hald.c	21 Apr 2004 15:20:09 -0000	1.3
+++ b/hald.c	21 Apr 2004 18:44:41 -0000	1.4
@@ -65,11 +65,13 @@
 		   gboolean is_added, gpointer user_data)
 {
 	if (is_added)
-		HAL_INFO(("Added device to GDL!"));
+		HAL_INFO (("Added device to GDL; udi=%s",
+			   hal_device_get_udi(device)));
 	else
-		HAL_INFO(("Removed device from GDL!"));
+		HAL_INFO (("Removed device from GDL; udi=%s",
+			   hal_device_get_udi(device)));
 
-	hal_device_print (device);
+	/*hal_device_print (device);*/
 
 	if (is_added) {
 		manager_send_signal_device_added (device);