diff options
author | Vincent Sanders <vince@netsurf-browser.org> | 2011-02-23 22:27:55 +0000 |
---|---|---|
committer | Vincent Sanders <vince@netsurf-browser.org> | 2011-02-23 22:27:55 +0000 |
commit | 0231675abf3b467cff49d1976df882931d91019d (patch) | |
tree | 08756930c2008871cf5fd5bc0ce345411377cb57 /framebuffer/font_freetype.c | |
parent | b49669d17e0c9dc70c775623d6cc1154619ff83b (diff) | |
download | netsurf-0231675abf3b467cff49d1976df882931d91019d.tar.gz netsurf-0231675abf3b467cff49d1976df882931d91019d.tar.bz2 |
add resource handling
move gtk and framebuffer to use generic resource handling
svn path=/trunk/netsurf/; revision=11772
Diffstat (limited to 'framebuffer/font_freetype.c')
-rw-r--r-- | framebuffer/font_freetype.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c index ea183ea4b..44d6701dc 100644 --- a/framebuffer/font_freetype.c +++ b/framebuffer/font_freetype.c @@ -27,6 +27,7 @@ #include "render/font.h" #include "utils/utf8.h" #include "utils/log.h" +#include "utils/resource.h" #include "desktop/options.h" #include "framebuffer/gui.h" @@ -112,7 +113,7 @@ static FT_Error ft_face_requester(FTC_FaceID face_id, FT_Library library, FT_Po /* create new framebuffer face and cause it to be loaded to check its ok */ static fb_faceid_t * -fb_new_face(const char *option, const char *resname, const char *fontfile) +fb_new_face(const char *option, const char *resname, const char *fontname) { fb_faceid_t *newf; FT_Error error; @@ -124,13 +125,13 @@ fb_new_face(const char *option, const char *resname, const char *fontfile) if (option != NULL) { newf->fontfile = strdup(option); } else { - fb_find_resource(buf, resname, fontfile); + resource_sfind(respaths, buf, fontname); newf->fontfile = strdup(buf); } error = FTC_Manager_LookupFace(ft_cmanager, (FTC_FaceID)newf, &aface); if (error) { - LOG(("Could not find font face %s (code %d)\n", fontfile, error)); + LOG(("Could not find font face %s (code %d)\n", fontname, error)); free(newf); newf = NULL; } |