summaryrefslogtreecommitdiff
path: root/beos/beos_gui.cpp
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2009-07-23 23:05:34 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2009-07-23 23:05:34 +0000
commitddeadd1c02880367ad786b113d352a519f45ec73 (patch)
tree00b8b46ee1a3fc84e5492c2183dfaa8192d261f9 /beos/beos_gui.cpp
parentb20949a35025b23da1bf0ac6003f4575eb94281d (diff)
downloadnetsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.gz
netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.bz2
Merge LibCSS port to trunk.
svn path=/trunk/netsurf/; revision=8752
Diffstat (limited to 'beos/beos_gui.cpp')
-rw-r--r--beos/beos_gui.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/beos/beos_gui.cpp b/beos/beos_gui.cpp
index 866c73023..0835a934c 100644
--- a/beos/beos_gui.cpp
+++ b/beos/beos_gui.cpp
@@ -96,6 +96,7 @@ bool gui_in_multitask = false;
bool replicated = false; /**< if we are running as a replicant */
char *default_stylesheet_url;
+char *quirks_stylesheet_url;
char *adblock_stylesheet_url;
char *options_file_location;
char *glade_file_location;
@@ -266,7 +267,7 @@ static char *generate_default_css()
return NULL;
const char *params[] = { 0 };
- if (!content_set_type(c, CONTENT_CSS, "text/css", params))
+ if (!content_set_type(c, CONTENT_CSS, "text/css", params, NULL))
return NULL;
if (!content_process_data(c, text.String(), text.Length()))
@@ -567,6 +568,14 @@ void gui_init(int argc, char** argv)
LOG(("Using '%s' as Default CSS URL", default_stylesheet_url));
#ifdef USE_RESOURCES
+ quirks_stylesheet_url = strdup("rsrc:/quirks.css,text/css");
+#else
+ find_resource(buf, "quirks.css", "./beos/res/quirks.css");
+ default_stylesheet_url = path_to_url(buf);
+#endif
+
+
+#ifdef USE_RESOURCES
adblock_stylesheet_url = strdup("rsrc:/adblock.css,text/css");
#else
find_resource(buf, "adblock.css", "./beos/res/adblock.css");
@@ -740,6 +749,7 @@ void gui_quit(void)
//options_save_tree(hotlist,option_hotlist_file,messages_get("TreeHotlist"));
free(default_stylesheet_url);
+ free(quirks_stylesheet_url);
free(adblock_stylesheet_url);
free(option_cookie_file);
free(option_cookie_jar);