diff options
| author | Danny Kukawka <danny.kukawka@web.de> | 2008-03-17 21:05:22 +0100 |
|---|---|---|
| committer | Danny Kukawka <danny.kukawka@web.de> | 2008-03-17 21:05:22 +0100 |
| commit | 3ad7ec3bd192a2144a1d7a6a89e7a86d03cfbe85 (patch) | |
| tree | 353975da648490b0b5b071eb2a90d5d3fe5bbd03 /fdi | |
| parent | 89dc09ce86f4fabcdcd91f87ed28b9d273a258a4 (diff) | |
clean up Apple releted fdi-files
Cleaned up Apple releted fdi-files and put similar devices together
to one match.
Diffstat (limited to 'fdi')
| -rw-r--r-- | fdi/policy/10osvendor/10-imac-backlight.fdi | 12 | ||||
| -rw-r--r-- | fdi/policy/10osvendor/10-macbook-backlight.fdi | 5 | ||||
| -rw-r--r-- | fdi/policy/10osvendor/10-macbookpro-utils.fdi | 22 |
3 files changed, 4 insertions, 35 deletions
diff --git a/fdi/policy/10osvendor/10-imac-backlight.fdi b/fdi/policy/10osvendor/10-imac-backlight.fdi index 56d343e4..420da11d 100644 --- a/fdi/policy/10osvendor/10-imac-backlight.fdi +++ b/fdi/policy/10osvendor/10-imac-backlight.fdi @@ -4,16 +4,8 @@ <device> <match key="system.kernel.name" string="Linux"> <match key="system.hardware.vendor" contains="Apple"> - <!-- iMac (Core 2 Duo) --> - <match key="system.hardware.product" string="iMac5,1"> - <spawn udi="/org/freedesktop/Hal/devices/imac_backlight"/> - </match> - <!-- iMac (24-inch Core 2 Duo) --> - <match key="system.hardware.product" string="iMac6,1"> - <spawn udi="/org/freedesktop/Hal/devices/imac_backlight"/> - </match> - <!-- iMac (Alu 24-inch Core 2 Duo) --> - <match key="system.hardware.product" string="iMac7,1"> + <!-- iMac (Core 2 Duo), iMac (24-inch Core 2 Duo), iMac (Alu 24-inch Core 2 Duo) --> + <match key="system.hardware.product" string_outof="iMac5,1;iMac6,1;iMac7,1"> <spawn udi="/org/freedesktop/Hal/devices/imac_backlight"/> </match> </match> diff --git a/fdi/policy/10osvendor/10-macbook-backlight.fdi b/fdi/policy/10osvendor/10-macbook-backlight.fdi index 4bc39a2a..951d923a 100644 --- a/fdi/policy/10osvendor/10-macbook-backlight.fdi +++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi @@ -4,10 +4,7 @@ <device> <match key="system.kernel.name" string="Linux"> <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="system.hardware.product" string="MacBook2,1"> + <match key="system.hardware.product" string_outof="MacBook1,1;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 538ee930..a6cd78ef 100644 --- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi +++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi @@ -6,27 +6,7 @@ <device> <match key="system.kernel.name" string="Linux"> <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"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/> - </match> - <match key="system.hardware.product" string="MacBookPro1,2"> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/> - </match> - <match key="system.hardware.product" string="MacBookPro2,1"> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/> - </match> - <match key="system.hardware.product" string="MacBookPro2,2"> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/> - <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/> - </match> - <match key="system.hardware.product" string="MacBookPro3,1"> + <match key="system.hardware.product" string_outof="MacBookPro1,1;MacBookPro1,2;MacBookPro2,1;MacBookPro2,2;MacBookPro3,1"> <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/> <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/> <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/> |