diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2004-10-17 22:13:35 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2004-10-17 22:13:35 +0000 |
| commit | fff5f231ed84b05d0c062e87055c600f419ec15b (patch) | |
| tree | ab1506ca034f91b88776b79d0635d6a1ef7f213c /render | |
| parent | 892a348b7331b66f27e41e3ac6b91cd924243d81 (diff) | |
| download | netsurf-fff5f231ed84b05d0c062e87055c600f419ec15b.tar.gz netsurf-fff5f231ed84b05d0c062e87055c600f419ec15b.tar.bz2 | |
[project @ 2004-10-17 22:13:34 by jmb]
Lose hard-coded stylesheet URLs.
svn path=/import/netsurf/; revision=1323
Diffstat (limited to 'render')
| -rw-r--r-- | render/html.c | 14 | ||||
| -rw-r--r-- | render/html.h | 3 |
2 files changed, 5 insertions, 12 deletions
diff --git a/render/html.c b/render/html.c index abbbb92b9..62f75aadf 100644 --- a/render/html.c +++ b/render/html.c @@ -20,9 +20,7 @@ #include "netsurf/content/fetch.h" #include "netsurf/content/fetchcache.h" #include "netsurf/desktop/imagemap.h" -#ifdef riscos #include "netsurf/desktop/gui.h" -#endif #include "netsurf/desktop/options.h" #include "netsurf/render/box.h" #include "netsurf/render/font.h" @@ -337,11 +335,7 @@ void html_find_stylesheets(struct content *c, xmlNode *head) c->active = 0; c->data.html.stylesheet_content[STYLESHEET_BASE] = fetchcache( -#ifdef riscos - "file:/<NetSurf$Dir>/Resources/CSS", -#else - "file:///home/james/Projects/netsurf/CSS", -#endif + default_stylesheet_url, html_convert_css_callback, c, (void *) STYLESHEET_BASE, c->width, c->height, true, 0, 0, false); @@ -353,11 +347,7 @@ void html_find_stylesheets(struct content *c, xmlNode *head) if (option_block_ads) { c->data.html.stylesheet_content[STYLESHEET_ADBLOCK] = fetchcache( -#ifdef riscos - "file:/<NetSurf$Dir>/Resources/AdBlock", -#else - "file:///home/james/Projects/netsurf/AdBlock", -#endif + adblock_stylesheet_url, html_convert_css_callback, c, (void *) STYLESHEET_ADBLOCK, c->width, c->height, true, 0, 0, false); diff --git a/render/html.h b/render/html.h index ec27dc531..c91f89f1f 100644 --- a/render/html.h +++ b/render/html.h @@ -33,6 +33,9 @@ struct plotters; #define STYLESHEET_STYLE 2 /* <style> elements (not cached) */ #define STYLESHEET_START 3 /* start of document stylesheets */ +extern char *default_stylesheet_url; +extern char *adblock_stylesheet_url; + /** Data specific to CONTENT_HTML. */ struct content_html_data { htmlParserCtxt *parser; /**< HTML parser context. */ |