Rename utils/resource to utils/filepath to avoid confusion with resource: fetcher.

svn path=/trunk/netsurf/; revision=12088

3 files changed, 12 insertions, 12 deletions

diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c
index ba4f87218..b864b2ba5 100644
--- a/framebuffer/findfile.c
+++ b/framebuffer/findfile.c
@@ -25,9 +25,9 @@
 
 #include <curl/curl.h>
 
+#include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/url.h"
-#include "utils/resource.h"
 #include "content/fetchers/resource.h"
 
 #include "framebuffer/findfile.h"
@@ -47,11 +47,11 @@ fb_init_resource(const char *resource_path)
 	char **respath; /* resource paths vector */
 	const char *lang = NULL;
 
-	pathv = resource_path_to_strvec(resource_path);
+	pathv = filepath_path_to_strvec(resource_path);
 
-	respath = resource_generate(pathv, &lang);
+	respath = filepath_generate(pathv, &lang);
 
-	resource_free_strvec(pathv);
+	filepath_free_strvec(pathv);
 
 	return respath;
 }
@@ -95,7 +95,7 @@ char *url_to_path(const char *url)
 char* gui_find_resource(const char *filename)
 {
 	char buf[PATH_MAX];
-	return path_to_url(resource_sfind(respaths, buf, filename));
+	return path_to_url(filepath_sfind(respaths, buf, filename));
 }
 
 /*
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index c1e5fcc3a..bd17d6366 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -26,9 +26,9 @@
 #include "css/css.h"
 #include "css/utils.h"
 #include "render/font.h"
+#include "utils/filepath.h"
 #include "utils/utf8.h"
 #include "utils/log.h"
-#include "utils/resource.h"
 #include "desktop/options.h"
 
 #include "framebuffer/gui.h"
@@ -126,7 +126,7 @@ fb_new_face(const char *option, const char *resname, const char *fontname)
         if (option != NULL) {
                 newf->fontfile = strdup(option);
         } else {
-		resource_sfind(respaths, buf, fontname);
+		filepath_sfind(respaths, buf, fontname);
                 newf->fontfile = strdup(buf);
         }
 
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 078a2e760..128171695 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -37,7 +37,7 @@
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
 #include "desktop/shape.h"
-#include "utils/resource.h"
+#include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/schedule.h"
@@ -457,12 +457,12 @@ gui_init(int argc, char** argv)
 	LOG(("Using '%s' as AdBlock CSS URL", adblock_stylesheet_url));
 
 	if (option_cookie_file == NULL) {
-		option_cookie_file = resource_find(respaths, "Cookies");
+		option_cookie_file = filepath_find(respaths, "Cookies");
 		LOG(("Using '%s' as Cookies file", option_cookie_file));
 	}
 
 	if (option_cookie_jar == NULL) {
-		option_cookie_jar = resource_find(respaths, "Cookies");
+		option_cookie_jar = filepath_find(respaths, "Cookies");
 		LOG(("Using '%s' as Cookie Jar file", option_cookie_jar));
 	}
 
@@ -505,8 +505,8 @@ main(int argc, char** argv)
 
 	respaths = fb_init_resource("${HOME}/.netsurf/:${NETSURFRES}:"NETSURF_FB_RESPATH":./framebuffer/res:"NETSURF_FB_FONTPATH);
 
-	options = resource_find(respaths, "Choices");
-	messages = resource_find(respaths, "messages");
+	options = filepath_find(respaths, "Choices");
+	messages = filepath_find(respaths, "messages");
 
 	netsurf_init(&argc, &argv, options, messages);