hal: Branch 'master'

[Jeff Mitchell]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

New commits:
diff-tree 146d8fe54936d3d7b0e405a8c06c94fca321f7ce (from 4fa827c85bcc285272e42a0baa6ca4a36d642fb7)
Author: Jeff Mitchell <kde-dev at emailgoeshere.com>
Date:   Tue Jun 12 10:56:34 2007 -0400

    Clean up the iPod entry a bit, add a key.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b16304e..c34f135 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -6,12 +6,13 @@
     <match key="info.category" string="storage">
       <!-- Apple iPod - TODO: use USB ids to determine exact output formats  -->
       <match key="storage.vendor" contains="Apple">
-	<match key="storage.model" contains="iPod">
+        <match key="storage.model" contains="iPod">
           <merge key="portable_audio_player.access_method" type="string">storage</merge>
+          <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
           <merge key="portable_audio_player.type" type="string">ipod</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+          <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
           <merge key="storage.requires_eject" type="bool">true</merge>
-	</match>
+        </match>
       </match>
 
       <!-- USB Mass Storage devices that are music players -->