From 4317ae2d1e6440527b22c0b0f0fcd71d902a5bb6 Mon Sep 17 00:00:00 2001 From: Marijn van Vliet Date: Sun, 18 Apr 2010 17:49:41 +0000 Subject: [PATCH] Default CSS file NULL git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@240 ddfedd41-794f-dd11-ae45-00112f111e67 --- libchimara/chimara-glk.c | 2 +- libchimara/style.c | 40 +++++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index b6b88c7..c7d0c52 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -85,7 +85,7 @@ chimara_glk_init(ChimaraGlk *self) priv->protect = FALSE; priv->default_font_desc = pango_font_description_from_string("Serif"); priv->monospace_font_desc = pango_font_description_from_string("Monospace"); - priv->css_file = "style.css"; + priv->css_file = NULL; priv->default_styles = g_new0(StyleSet,1); priv->current_styles = g_new0(StyleSet,1); priv->pager_attr_list = pango_attr_list_new(); diff --git a/libchimara/style.c b/libchimara/style.c index 93bf2b3..96750ad 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -287,27 +287,29 @@ style_init() /* Create the CSS file scanner */ GScanner *scanner = g_scanner_new(NULL); - int f = open(glk_data->css_file, O_RDONLY); - if(f != -1) - { - g_scanner_input_file(scanner, f); - scanner->input_name = glk_data->css_file; - scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "#"; - scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z "-_" G_CSET_DIGITS; - scanner->config->symbol_2_token = TRUE; - scanner->config->cpair_comment_single = NULL; - scanner->config->scan_float = FALSE; - - /* Run the scanner over the CSS file, overriding defaults */ - while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) { - if( !style_accept_style_selector(scanner) ) - break; + if(glk_data->css_file != NULL) { + int f = open(glk_data->css_file, O_RDONLY); + if(f != -1) + { + g_scanner_input_file(scanner, f); + scanner->input_name = glk_data->css_file; + scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "#"; + scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z "-_" G_CSET_DIGITS; + scanner->config->symbol_2_token = TRUE; + scanner->config->cpair_comment_single = NULL; + scanner->config->scan_float = FALSE; + + /* Run the scanner over the CSS file, overriding defaults */ + while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) { + if( !style_accept_style_selector(scanner) ) + break; + } + + g_scanner_destroy(scanner); } - - g_scanner_destroy(scanner); + else + g_warning("Could not find CSS file"); } - else - g_warning("Could not find CSS file"); /* Set the current style to a copy of the default style */ g_hash_table_foreach(default_text_grid_styles, style_table_copy, current_text_grid_styles); -- 2.30.2