hal-info: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 469306ee2a9208599826ea7b7b5ac4c92f2b8349
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Dec 5 13:21:14 2008 +0100

    add more audio_folder for a BlackBerry 9000
    
    Added more audio_folder for a BlackBerry 9000.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index f1c8d2e..ce2b5be 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -608,10 +608,14 @@
           <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+          </match>
+	  <match key="@storage.originating_device:usb.product_id" int="0x8004">
+            <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">home/user/videos/</append>
           </match>
         </match>