From 80cc3266580e9fbd77f07b094f6248326cf2cee3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 20 Jun 2014 13:23:22 +0200
Subject: beos: Use PathFinder to locate resource folder.

So it can work wherever NetSurf is installed...

Note this uses a Haiku-specific API and definitely breaks BeOS build.
---
 beos/gui.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'beos')

diff --git a/beos/gui.cpp b/beos/gui.cpp
index d7f4ab01e..4f06b9f04 100644
--- a/beos/gui.cpp
+++ b/beos/gui.cpp
@@ -37,6 +37,7 @@
 #include <FindDirectory.h>
 #include <Mime.h>
 #include <Path.h>
+#include <PathFinder.h>
 #include <Roster.h>
 #include <Screen.h>
 #include <String.h>
@@ -79,9 +80,6 @@ extern "C" {
 
 static void *myrealloc(void *ptr, size_t len, void *pw);
 
-/* Where to search for shared resources.  Must have trailing / */
-#define RESPATH "/boot/apps/netsurf/res/"
-
 //TODO: use resources
 // enable using resources instead of files
 #define USE_RESOURCES 1
@@ -297,7 +295,13 @@ static char *find_resource(char *buf, const char *filename, const char *def)
 			return buf;
 	}
 
-	strcpy(t, RESPATH);
+
+	BPathFinder f((void*)find_resource);
+
+	BPath p;
+	f.FindPath(B_FIND_PATH_APPS_DIRECTORY, "netsurf/res/", p);
+	strcpy(t, p.Path());
+
 	strcat(t, filename);
 	realpath(t, buf);
 	if (access(buf, R_OK) == 0)
@@ -488,7 +492,10 @@ static bool nslog_stream_configure(FILE *fptr)
 
 static BPath get_messages_path()
 {
-	BPath p("/boot/apps/netsurf/res");
+	BPathFinder f((void*)get_messages_path);
+
+	BPath p;
+	f.FindPath(B_FIND_PATH_APPS_DIRECTORY, "netsurf/res", p);
 	// TODO: use Haiku's BLocale stuff
 	BString lang(getenv("LC_MESSAGES"));
 	lang.Truncate(2);
-- 
cgit v1.2.3