hal: Branch 'master' - 3 commits

[Richard Hughes]

 doc/spec/hal-spec-properties.xml                  |    8 ++++++++
 hald/linux/device.c                               |    2 ++
 tools/linux/hal-system-power-hibernate-linux      |    1 +
 tools/linux/hal-system-power-suspend-hybrid-linux |    1 +
 tools/linux/hal-system-power-suspend-linux        |    1 +
 5 files changed, 13 insertions(+)

New commits:
diff-tree adeac81114edea79b7188b496c8862e5ec7162c9 (from parents)
Merge: 0dd3b53ea3bdfa9017e74c84bb3b969d17b4383d bed20e91b52fbea7f48f239c7d1283952d17afd9
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 3 11:51:33 2007 +0100

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

diff-tree 0dd3b53ea3bdfa9017e74c84bb3b969d17b4383d (from 90a7e5e4047780cd3694a116e142d274f54228fc)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 3 11:51:07 2007 +0100

    add debug message when we remove a device when the prober fails
    
    For debugging it would be nice to be told in the debugging spew when a
    device is removed from a prober failure, else it's impossible to debug when
    something doesn't work in the prober and the device is silently removed.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index a5240b6..1660f3f 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3356,6 +3356,8 @@ add_dev_probing_helper_done (HalDevice *
 	/* Discard device if probing reports failure */
 	if (exit_type != HALD_RUN_SUCCESS || return_code != 0) {
 		hal_device_store_remove (hald_get_tdl (), d);
+		HAL_INFO (("device removed due to prober fail"));
+		hal_device_print (d);
 		g_object_unref (d);
 		hotplug_event_end (end_token);
 		goto out;
diff-tree 90a7e5e4047780cd3694a116e142d274f54228fc (from e8a22c066d0e1b6861e801fe9a517ddaef568708)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Jul 3 00:02:58 2007 +0100

    add power_management.quirk.reset_brightness
    
    Add power_management.quirk.reset_brightness so we can reset the brightness
    state as a quirk action. The pm-utils parts are already in place.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 730f826..cdf0898 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -6511,6 +6511,14 @@ org.freedesktop.Hal.Device.Volume.method
             </row>
             <row>
               <entry>
+                <literal>power_management.quirk.reset_brightness</literal> (bool)
+              </entry>
+              <entry></entry>
+              <entry>No</entry>
+              <entry>Reset the brightness state after resume.</entry>
+            </row>
+            <row>
+              <entry>
                 <literal>power_management.quirk.none</literal> (bool)
               </entry>
               <entry></entry>
diff --git a/tools/linux/hal-system-power-hibernate-linux b/tools/linux/hal-system-power-hibernate-linux
index aa1905f..915e96e 100755
--- a/tools/linux/hal-system-power-hibernate-linux
+++ b/tools/linux/hal-system-power-hibernate-linux
@@ -19,6 +19,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS" = "true" ] && QUIRKS="$QUIRKS --quirk-reset-brightness"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
 
 # We only support pm-utils
diff --git a/tools/linux/hal-system-power-suspend-hybrid-linux b/tools/linux/hal-system-power-suspend-hybrid-linux
index 8e5bc6c..dc149f8 100755
--- a/tools/linux/hal-system-power-suspend-hybrid-linux
+++ b/tools/linux/hal-system-power-suspend-hybrid-linux
@@ -27,6 +27,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS" = "true" ] && QUIRKS="$QUIRKS --quirk-reset-brightness"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
 
 # We only support pm-utils
diff --git a/tools/linux/hal-system-power-suspend-linux b/tools/linux/hal-system-power-suspend-linux
index 425d56b..157201f 100755
--- a/tools/linux/hal-system-power-suspend-linux
+++ b/tools/linux/hal-system-power-suspend-linux
@@ -27,6 +27,7 @@ QUIRKS=""
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VGA_MODE_3" = "true" ] && QUIRKS="$QUIRKS --quirk-vga-mode3"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_VBE_POST" = "true" ] && QUIRKS="$QUIRKS --quirk-vbe-post"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RADEON_OFF" = "true" ] && QUIRKS="$QUIRKS --quirk-radeon-off"
+[ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_RESET_BRIGHTNESS" = "true" ] && QUIRKS="$QUIRKS --quirk-reset-brightness"
 [ "$HAL_PROP_POWER_MANAGEMENT_QUIRK_NONE" = "true" ] && QUIRKS="$QUIRKS --quirk-none"
 
 # Urh. Do any BIOSen handle this correctly?