gtk-css-engine r204 - in trunk: . src

[robsta svn gnome org]

Author: robsta
Date: Mon Dec  1 18:55:41 2008
New Revision: 204
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=204&view=rev

Log:
* src/css2gtkrc.c (main):
* src/gce-rc-style.c (parse):
Fix after ccss API changes (user-data to property- and function-
handlers).



Modified:
   trunk/ChangeLog
   trunk/src/css2gtkrc.c
   trunk/src/gce-rc-style.c

Modified: trunk/src/css2gtkrc.c
==============================================================================
--- trunk/src/css2gtkrc.c	(original)
+++ trunk/src/css2gtkrc.c	Mon Dec  1 18:55:41 2008
@@ -42,7 +42,8 @@
 	grammar = ccss_cairo_grammar_create ();
 	ccss_grammar_add_properties (grammar, gce_properties_get_ptable ());
 
-	stylesheet = ccss_grammar_create_stylesheet_from_file (grammar, argv[1]);
+	stylesheet = ccss_grammar_create_stylesheet_from_file (grammar, argv[1],
+							       NULL);
 	g_assert (stylesheet);
 
 	gtkrc = gce_serialize (stylesheet);

Modified: trunk/src/gce-rc-style.c
==============================================================================
--- trunk/src/gce-rc-style.c	(original)
+++ trunk/src/gce-rc-style.c	Mon Dec  1 18:55:41 2008
@@ -95,7 +95,8 @@
 		ccss_grammar_add_functions (grammar, gce_functions_get_vtable ());
 
 		_stylesheet = ccss_grammar_create_stylesheet_from_file (grammar,
-									gce_file);
+									gce_file,
+									NULL);
 		if (_stylesheet) {
 			ccss_grammar_destroy (grammar), grammar = NULL;
 		} else {
@@ -105,7 +106,8 @@
 
 		/* User-agent stylesheet */
 		_stylesheet = ccss_stylesheet_add_from_file (_stylesheet, GCE_UA_STYLESHEET,
-							     CCSS_STYLESHEET_USER_AGENT);
+							     CCSS_STYLESHEET_USER_AGENT,
+							     NULL);
 
 		if (!_stylesheet) {
 			g_critical ("Could not add user-agent stylesheet `%s'",