hal: Branch 'master' - 2 commits

[Richard Hughes]

 fdi/policy/10osvendor/10-power-mgmt-policy.fdi |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f282f061898492cda468382f9a69df8ebc06eb2e (from parents)
Merge: ee7e6e0c59581bed30e0b286a31b650fbddbc2de ddc1015be5e210cad4739fcfccfecb27fca754c8
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 17 16:49:26 2007 +0100

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

diff-tree ee7e6e0c59581bed30e0b286a31b650fbddbc2de (from d6c277cfb680e08c2b0689e103c5597c749df001)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 17 16:47:45 2007 +0100

    fix the input parameter for the SetPowerSave method
    
    When we were fixing the uint/int retval problem a few months ago the
    SetPowerSave method got changed from u SetPowerSave (b) to u
    SetPowerSave (i). The hal-system-power-set-power-save script assumes the
    bool rather than the signed int. This gives the error in
    gnome-power-manager:
    
    ** WARNING **: ERROR:
     usage : hal-set-property --udi <udi> --key <key> aborting...
    
    This also causes an abort if --g-fatal-warnings is used to run g-p-m.
    
    I assume you just changed the b to an i as an oversight, in which case
    the attached patch fixes the problem. If you do want to keep the script
    input parameter as an int we'll have to fix up the shell we are using.

diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
index b3760d5..ec5613f 100644
--- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -52,7 +52,7 @@
       <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-reboot</append>
 
       <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_names" type="strlist">SetPowerSave</append>
-      <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist">i</append>
+      <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_signatures" type="strlist">b</append>
       <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_argnames" type="strlist">enable_power_save</append>
       <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-set-power-save</append>