hal/hald/linux2 blockdev.c,1.42,1.43

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory kemper:/tmp/cvs-serv564/hald/linux2

Modified Files:
	blockdev.c 
Log Message:
2006-06-06  David Zeuthen  <davidz at redhat.com>

        * hald/linux2/blockdev.c (hotplug_event_begin_add_blockdev): Set
        capability volume.disc as required by the spec. Patch from Kevin
        Ottens <ervin at kde.org>.



Index: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- blockdev.c	19 May 2006 17:12:03 -0000	1.42
+++ blockdev.c	6 Jun 2006 15:07:23 -0000	1.43
@@ -988,6 +988,9 @@
 		hal_device_property_set_bool (d, "volume.is_partition", TRUE);
 
 		hal_device_property_set_string (d, "info.category", "volume");
+		if (strcmp(hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0) {
+			hal_device_add_capability (d, "volume.disc");
+		}
 		hal_device_add_capability (d, "volume");
 		hal_device_add_capability (d, "block");