Ticket #2185: HWindow.cpp.diff

src/preferences/sounds/HWindow.cpp

@@ -35 +35 @@
 #include <fs_attr.h>
 #include <stdio.h>
 #include <Sound.h>
+#include <FindDirectory.h>
 
 /***********************************************************
  * Constructor
@@ -330 +331 @@
         menu->AddItem(new BMenuItem(path.Leaf(), msg), 0);
     }
     
-    BPath path("/boot/beos/etc/sounds");
-    status_t err = B_OK;
+    BPath path;
+    status_t err = find_directory(B_BEOS_SOUNDS_DIRECTORY, &path);
     BDirectory dir( path.Path() );
     BEntry entry;
     BPath item_path;
@@ -351 +352 @@
         msg->AddRef("refs", &ref);
         menu->AddItem(new BMenuItem(item_path.Leaf(), msg), 0);
     }
-    
-    path.SetTo("/boot/home/config/sounds");
+
+    err = find_directory(B_USER_SOUNDS_DIRECTORY, &path);
     dir.SetTo(path.Path());
-    err = B_OK;
     while (err == B_OK) {
         err = dir.GetNextEntry((BEntry *)&entry, true);
         if (entry.InitCheck() != B_NO_ERROR) {
@@ -372 +372 @@
         msg->AddRef("refs", &ref);
         menu->AddItem(new BMenuItem(item_path.Leaf(), msg), 0);
     }
-    
-    path.SetTo("/boot/home/media");
+
+    err = find_directory(B_COMMON_SOUNDS_DIRECTORY, &path);
     dir.SetTo(path.Path());
-    err = B_OK;
     while (err == B_OK) {
         err = dir.GetNextEntry((BEntry *)&entry, true);
         if (entry.InitCheck() != B_NO_ERROR) {