From 6a10bc8d7d186fd83099c75c2a03409d0881aae9 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 16 Jun 2011 22:10:50 +0300
Subject: Fix dataDir in branding files. Move path functions to paths.cpp

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

(limited to 'src/configuration.cpp')

diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7969c9341..2d569314a 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -25,15 +25,13 @@
 #include "configlistener.h"
 #include "log.h"
 
+#include "utils/paths.h"
 #include "utils/stringutils.h"
 #include "utils/xml.h"
 
 #include <libxml/encoding.h>
 
 #include <stdlib.h>
-#ifdef WIN32
-#define realpath(N,R) _fullpath((R),(N),_MAX_PATH)
-#endif
 
 #include "debug.h"
 
@@ -400,9 +398,7 @@ void Configuration::init(const std::string &filename, bool useResManager)
     else
     {
         mConfigPath = filename;
-        char *realPath = realpath(getFileDir(filename).c_str(), NULL);
-        mDirectory = realPath;
-        free(realPath);
+        mDirectory = getRealPath(getFileDir(filename));
     }
 
     if (!doc.rootNode())
-- 
cgit v1.2.3-60-g2f50