hal/hald/linux2 osspec.c,1.46,1.47

[Richard Hughes]

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

Modified Files:
	osspec.c 
Log Message:
2006-05-08  Richard Hughes  <davidz at redhat.com>
 * doc/spec/hal-spec.xml.in: * hald/linux2/osspec.c: (set_suspend_hibernate_keys): Depreciate the keys power_management.can_suspend_to_ram and power_management.can_suspend_to_disk in favour of power_management.can_suspend and power_management.can_hibernate so it's all consistent between the method names and the can_* keys. We'll remove the former keys in a year or so, but leave them now for compatability.


Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- osspec.c	1 May 2006 21:32:54 -0000	1.46
+++ osspec.c	8 May 2006 18:39:32 -0000	1.47
@@ -477,6 +477,12 @@
 	if (access ("/proc/suspend2", F_OK) == 0)
 		can_hibernate = TRUE;
 out:
+	hal_device_property_set_bool (d, "power_management.can_suspend", can_suspend);
+	hal_device_property_set_bool (d, "power_management.can_hibernate", can_hibernate);
+
+	/* WARNING: These keys are depreciated and power_management.can_suspend
+	 * and power_management.can_hibernate should be used instead.
+	 * These properties will be removed, but not before May 1st 2007. */
 	hal_device_property_set_bool (d, "power_management.can_suspend_to_ram", can_suspend);
 	hal_device_property_set_bool (d, "power_management.can_suspend_to_disk", can_hibernate);
 }