hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi |   13 ++++++----
 fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi      |   13 ++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

New commits:
commit ab57c4bab73b80bf4cfc597d783e637d48ae7c79
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Dec 6 18:50:25 2007 +0100

    add Dell KillSwitch devices only if dcdbas is loaded
    
    This hanges HAL to provide the Dell WLAN/Bluetooth KillSwitch devices
    only if the needed dcdbas device is available (which means the module is
    loaded).
    
    The patch make the matches also independent from the different spellings of
    Dell ("Dell Inc.", "Dell Computer Corporation")

diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
index 231eb17..4921163 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-bluetooth.fdi
@@ -3,11 +3,14 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="system.kernel.name" string="Linux"> 
-      <match key="system.hardware.vendor" string="Dell Inc.">
-        <match key="system.formfactor" string="laptop">
-	  <!-- TODO: check if laptop actually sports an SMI interface -->
-          <spawn udi="/org/freedesktop/Hal/devices/dell_bluetooth_switch"/>
+    <match key="info.bus" string="platform">
+      <match key="platform.id" string="dcdbas">
+        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="Dell ">
+            <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+              <spawn udi="/org/freedesktop/Hal/devices/dell_bluetooth_switch"/>
+            </match>
+          </match>
         </match>
       </match>
     </match>
diff --git a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
index 446d6b2..f5aa6a6 100644
--- a/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
+++ b/fdi/information/10freedesktop/10-dell-rfkill-switch-wlan.fdi
@@ -3,11 +3,14 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="system.kernel.name" string="Linux"> 
-      <match key="system.hardware.vendor" string="Dell Inc.">
-        <match key="system.formfactor" string="laptop">
-	  <!-- TODO: check if laptop actually sports an SMI interface -->
-          <spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
+    <match key="info.bus" string="platform">
+      <match key="platform.id" string="dcdbas">
+        <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" string="Linux"> 
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="Dell ">
+            <match key="/org/freedesktop/Hal/devices/computer:system.formfactor" string="laptop">
+              <spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
+            </match>
+	  </match>
         </match>
       </match>
     </match>