hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-macbook-backlight.fdi |    6 +++---
 fdi/policy/10osvendor/10-macbookpro-utils.fdi  |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 68eb19a7cf5e31203bf7d1c8728e61afc74975bb (from a4711146e3249cba3feb8b6a37a09083bf1c08d7)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Jul 25 21:02:09 2007 -0400

    fix up how we detect Apple laptops

diff --git a/fdi/policy/10osvendor/10-macbook-backlight.fdi b/fdi/policy/10osvendor/10-macbook-backlight.fdi
index ad2347a..4bc39a2 100644
--- a/fdi/policy/10osvendor/10-macbook-backlight.fdi
+++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi
@@ -3,11 +3,11 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.kernel.name" string="Linux">
-      <match key="smbios.system.manufacturer" string="Apple">
-        <match key="smbios.system.product" string="MacBook1,1">
+      <match key="system.hardware.vendor" contains="Apple">
+        <match key="system.hardware.product" string="MacBook1,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_backlight"/>
         </match>
-        <match key="smbios.system.product" string="MacBook2,1">
+        <match key="system.hardware.product" string="MacBook2,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_backlight"/>
         </match>
       </match>
diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
index 55b0bdd..a7370b1 100644
--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
@@ -5,7 +5,7 @@
   <!-- this is for Macbook Pro (LCD panel, light sensor, keyboard backlight) -->
   <device>
     <match key="system.kernel.name" string="Linux">
-      <match key="system.hardware.vendor" string="Apple">
+      <match key="system.hardware.vendor" contains="Apple">
         <match key="system.hardware.product" string="MacBookPro1,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>