From 5cffb54e48034b0bc7bce2ae9a61ce4a24464e63 Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Sun, 4 Jan 2009 13:17:38 +0100
Subject: Fixed installing of dejavusans.ttf font.

(cherry picked from mainline commit 8d1299338e033e1de539dae36856e365855fabc1)

Conflicts:

	src/gui/gui.cpp
---
 src/gui/gui.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/gui/gui.cpp')

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4052951f..61da1a0c 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -106,9 +106,11 @@ Gui::Gui(Graphics *graphics):
     Window::setWindowContainer(guiTop);
     setTop(guiTop);
 
-    // Set global font (based on ISO-8859-15)
+    // Set global font
+    ResourceManager *resman = ResourceManager::getInstance();
+    std::string path = resman->getPath("fonts/dejavusans.ttf");
     try {
-        mGuiFont = new TrueTypeFont("data/fonts/dejavusans.ttf", 11);
+        mGuiFont = new TrueTypeFont(path, 11);
     }
     catch (gcn::Exception e)
     {
-- 
cgit v1.2.3-70-g09d2