Build resource: map at start time

Remove stylesheet url globals -- the core will always use resource:{default,quirks,adblock}.css as appropriate

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

2 files changed, 11 insertions, 16 deletions

diff --git a/framebuffer/findfile.c b/framebuffer/findfile.c
index 588acfb4d..5cfde1656 100644
--- a/framebuffer/findfile.c
+++ b/framebuffer/findfile.c
@@ -98,10 +98,19 @@ char *url_to_path(const char *url)
 	return respath;
 }
 
-char* gui_get_resource_url(const char *filename)
+nsurl *gui_get_resource_url(const char *path)
 {
 	char buf[PATH_MAX];
-	return path_to_url(filepath_sfind(respaths, buf, filename));
+	char *raw;
+	nsurl *url = NULL;
+
+	raw = path_to_url(filepath_sfind(respaths, buf, path));
+	if (raw != NULL) {
+		nsurl_create(raw, &url);
+		free(raw);
+	}
+
+	return url;
 }
 
 /*
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index e8f3f2983..03362a2bb 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -62,10 +62,6 @@
 
 #define NSFB_TOOLBAR_DEFAULT_LAYOUT "blfsrut"
 
-char *default_stylesheet_url;
-char *quirks_stylesheet_url;
-char *adblock_stylesheet_url;
-
 fbtk_widget_t *fbtk;
 
 struct gui_window *input_window = NULL;
@@ -446,16 +442,6 @@ gui_init(int argc, char** argv)
 
 	option_core_select_menu = true;
 
-	/* set up stylesheet urls */
-	default_stylesheet_url = strdup("resource:default.css");
-	LOG(("Using '%s' as Default CSS URL", default_stylesheet_url));
-
-	quirks_stylesheet_url = strdup("resource:quirks.css");
-	LOG(("Using '%s' as quirks CSS URL", quirks_stylesheet_url));
-
-	adblock_stylesheet_url = strdup("resource:adblock.css");
-	LOG(("Using '%s' as AdBlock CSS URL", adblock_stylesheet_url));
-
 	if (option_cookie_file == NULL) {
 		option_cookie_file = strdup("~/.netsurf/Cookies");
 		LOG(("Using '%s' as Cookies file", option_cookie_file));