Ticket #2185: src_servers_app_FontManager.cpp.diff

src/servers/app/FontManager.cpp

@@ -317 +317 @@
     // default known mappings
     // TODO: load them for real, and use these as a fallback
 
-    _AddDefaultMapping("Bitstream Vera Sans", "Roman",
-        "/boot/beos/etc/fonts/ttfonts/Vera.ttf");
-    _AddDefaultMapping("Bitstream Vera Sans", "Bold",
-        "/boot/beos/etc/fonts/ttfonts/VeraBd.ttf");
-    _AddDefaultMapping("Bitstream Vera Sans Mono", "Roman",
-        "/boot/beos/etc/fonts/ttfonts/VeraMono.ttf");
+    BPath ttfontsPath;
+    if (find_directory(B_BEOS_FONTS_DIRECTORY, &ttfontsPath) == B_OK) {
+        ttfontsPath.Append("ttfonts");
 
+        BPath veraFontPath = ttfontsPath;
+        veraFontPath.Append("Vera.ttf");
+        _AddDefaultMapping("Bitstream Vera Sans", "Roman", veraFontPath.Path());
+
+        veraFontPath.SetTo(ttfontsPath.Path());
+        veraFontPath.Append("VeraBd.ttf");
+        _AddDefaultMapping("Bitstream Vera Sans", "Bold", veraFontPath.Path());
+
+        veraFontPath.SetTo(ttfontsPath.Path());
+        veraFontPath.Append("VeraMono.ttf");
+        _AddDefaultMapping("Bitstream Vera Sans Mono", "Roman", veraFontPath.Path());
+    }
+
     return false;
 }