summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@src.gnome.org>2003-05-27 22:11:45 +0000
committerDodji Seketeli <dodji@src.gnome.org>2003-05-27 22:11:45 +0000
commita83839af64b7db360926551aa4fb617b8a8cf1c6 (patch)
tree37b2a2653224ea32ce936d311925c928fd457755
parentcf4cbe481c91502d022975d30b40b96ec16080ea (diff)
downloadlibcroco-a83839af64b7db360926551aa4fb617b8a8cf1c6.tar.gz
Fixed some silly errors reported by
Kang Jeong-Hee <keizi@mail.co.kr>. Dodji.
-rw-r--r--TODO3
-rw-r--r--src/parser/cr-statement.c11
-rw-r--r--src/parser/cr-statement.h8
3 files changed, 16 insertions, 6 deletions
diff --git a/TODO b/TODO
index d999636..ad13a25 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,9 @@
*coding:)
Provide support for font selection. (hard)
+ First make sure to be able to gather all the font related property
+ values.
+ Then, figure out how to implement a font selector that uses pango.
Go forward in the cascading implementation in cr-sel-eng.c
test/debug it.
diff --git a/src/parser/cr-statement.c b/src/parser/cr-statement.c
index c461d36..ec29932 100644
--- a/src/parser/cr-statement.c
+++ b/src/parser/cr-statement.c
@@ -453,12 +453,19 @@ CRStatement*
cr_statement_new_ruleset (CRStyleSheet * a_sheet,
CRSelector *a_sel_list,
CRDeclaration *a_decl_list,
- CRAtMediaRule *a_media_rule)
+ CRStatement *a_parent_media_rule)
{
CRStatement *result = NULL ;
g_return_val_if_fail (a_sheet, NULL) ;
+ if (a_parent_media_rule)
+ {
+ g_return_val_if_fail
+ (a_parent_media_rule->type == AT_MEDIA_RULE_STMT,
+ NULL) ;
+ }
+
result = g_try_malloc (sizeof (CRStatement)) ;
if (!result)
@@ -483,7 +490,7 @@ cr_statement_new_ruleset (CRStyleSheet * a_sheet,
if (a_sel_list)
cr_selector_ref (a_sel_list) ;
result->kind.ruleset->decl_list = a_decl_list;
- result->kind.ruleset->media_rule = a_media_rule;
+ result->kind.ruleset->parent_media_rule = a_parent_media_rule;
cr_statement_set_parent_sheet (result, a_sheet) ;
diff --git a/src/parser/cr-statement.h b/src/parser/cr-statement.h
index f4d596b..4cb2509 100644
--- a/src/parser/cr-statement.h
+++ b/src/parser/cr-statement.h
@@ -74,7 +74,7 @@ struct _CRRuleSet
*The parent media rule, or NULL if
*no parent media rule exists.
*/
- CRAtMediaRule *media_rule ;
+ CRStatement *parent_media_rule ;
} ;
/*
@@ -218,7 +218,7 @@ struct _CRStatement
*libcroco itself will never modify
*this pointer.
*/
- gpointer *app_data ;
+ gpointer app_data ;
/**
*a custom pointer used
@@ -226,7 +226,7 @@ struct _CRStatement
*application should never use this
*pointer.
*/
- gpointer *croco_data ;
+ gpointer croco_data ;
} ;
@@ -235,7 +235,7 @@ CRStatement*
cr_statement_new_ruleset (CRStyleSheet *a_sheet,
CRSelector *a_sel_list,
CRDeclaration *a_decl_list,
- CRAtMediaRule *a_media_rule) ;
+ CRStatement *a_media_rule) ;
CRStatement*
cr_statement_new_at_import_rule (CRStyleSheet *a_container_sheet,