[node] Actually use the cached values.

Clean up leftover commented code.

4 files changed, 6 insertions, 27 deletions

diff --git a/ccss-gtk/ccss-gtk-stylesheet.c b/ccss-gtk/ccss-gtk-stylesheet.c
index 5b8a8a0..b13562f 100644
--- a/ccss-gtk/ccss-gtk-stylesheet.c
+++ b/ccss-gtk/ccss-gtk-stylesheet.c
@@ -211,12 +211,12 @@ accumulate_state (ccss_stylesheet_t 	 *stylesheet,
 	char			*color;
 	gboolean		 ret;
 
-	ccss_node_init ((ccss_node_t *) &node, &_node_class);
+	ccss_node_init (&node.parent, &_node_class);
 	node.type_name = type_name;
 	node.id = NULL;
 	node.pseudo_class = state_name;
 	
-	style = ccss_stylesheet_query (stylesheet, (ccss_node_t const *) &node);
+	style = ccss_stylesheet_query (stylesheet, &node.parent);
 	if (!style) {
 		return false;
 	}
diff --git a/ccss/ccss-node.c b/ccss/ccss-node.c
index 2ba33f0..1eb0973 100644
--- a/ccss/ccss-node.c
+++ b/ccss/ccss-node.c
@@ -186,13 +186,6 @@ ccss_node_get_container (ccss_node_t *self)
 	g_return_val_if_fail (self->node_class->get_container, NULL);
 
 	return self->node_class->get_container (self);
-
-/* We might cache this too in the future.
-	if (NULL == self->container)
-		self->container = self->node_class->get_container (self);
-
-	return self->container;
-*/
 }
 
 ccss_node_t *
@@ -203,13 +196,6 @@ ccss_node_get_base_style (ccss_node_t *self)
 	g_return_val_if_fail (self->node_class->get_base_style, NULL);
 
 	return self->node_class->get_base_style (self);
-
-/* We might cache this too in the future.
-	if (NULL == self->base_style)
-		self->base_style = self->node_class->get_base_style (self);
-
-	return self->base_style;
-*/
 }
 
 char const *
@@ -308,9 +294,9 @@ ccss_node_get_viewport (ccss_node_t const	*self,
 			uint32_t		*width,
 			uint32_t		*height)
 {
-	g_return_val_if_fail (self, NULL);
-	g_return_val_if_fail (self->node_class, NULL);
-	g_return_val_if_fail (self->node_class->get_viewport, NULL);
+	g_return_val_if_fail (self, FALSE);
+	g_return_val_if_fail (self->node_class, FALSE);
+	g_return_val_if_fail (self->node_class->get_viewport, FALSE);
 
 	return self->node_class->get_viewport (self, x, y, width, height);
 }
diff --git a/ccss/ccss-node.h b/ccss/ccss-node.h
index c692a06..1a77eeb 100644
--- a/ccss/ccss-node.h
+++ b/ccss/ccss-node.h
@@ -213,10 +213,6 @@ struct ccss_node_ {
 	/*< private >*/
 	ccss_node_class_t const *node_class;
 
-/* We might cache those too in the future.
-	ccss_node_t     *container;
-	ccss_node_t     *base_style;
-*/
 	ptrdiff_t        instance;
 	char const      *id;
 	char const      *type_name;
diff --git a/configure.in b/configure.in
index 7f92f60..377ca66 100644
--- a/configure.in
+++ b/configure.in
@@ -9,10 +9,7 @@ AC_PREREQ(2.54)
 m4_define([ccss_version_major], [0])
 m4_define([ccss_version_minor], [3])
 m4_define([ccss_version_micro], [0])
-### For the release:
-#m4_define([ccss_version_extra], [])
-### On trunk:
-m4_define([ccss_version_extra], [.trunk])
+m4_define([ccss_version_extra], [])
 m4_define([ccss_version],
     [ccss_version_major.ccss_version_minor.ccss_version_micro[]ccss_version_extra])