gtk-css-engine r158 - in trunk: . libccss/cccss src

[robsta svn gnome org]

Author: robsta
Date: Fri Oct  3 08:07:16 2008
New Revision: 158
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=158&view=rev

Log:
* Makefile.am: `make distcheck' with standalone libccss.

* libccss/cccss/Makefile.am:
* libccss/cccss/example-1.c:
* libccss/cccss/example-2.c:
* libccss/cccss/example-2.css:
Update/fix examples.

* src/gce-rc-style.c: fix warning.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/libccss/cccss/Makefile.am
   trunk/libccss/cccss/example-1.c
   trunk/libccss/cccss/example-2.c
   trunk/libccss/cccss/example-2.css
   trunk/src/gce-rc-style.c

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Oct  3 08:07:16 2008
@@ -1,6 +1,6 @@
 
 ACLOCAL_AMFLAGS = -I .
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror
+DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-werror --enable-libccss
 
 SUBDIRS = doc libccss src themes
 

Modified: trunk/libccss/cccss/Makefile.am
==============================================================================
--- trunk/libccss/cccss/Makefile.am	(original)
+++ trunk/libccss/cccss/Makefile.am	Fri Oct  3 08:07:16 2008
@@ -28,5 +28,6 @@
 
 EXTRA_DIST = \
 	example-1.css \
-	example-2.css
+	example-2.css \
+	foo.svg
 

Modified: trunk/libccss/cccss/example-1.c
==============================================================================
--- trunk/libccss/cccss/example-1.c	(original)
+++ trunk/libccss/cccss/example-1.c	Fri Oct  3 08:07:16 2008
@@ -51,10 +51,9 @@
 {
 	ClutterActor		*stage;
 	ClutterActor		*actor;
-	ClutterColor		 stage_color = { 0x00, 0x00, 0x00, 0xff };
-	ClutterColor		 actor_color = { 0xff, 0xff, 0xff, 0x99 };
 	ccss_stylesheet_t	*stylesheet;
 	cairo_t			*cr;
+	ClutterColor		 stage_color = { 0x00, 0x00, 0x00, 0xff };
 
 	clutter_init (&argc, &argv);
 

Modified: trunk/libccss/cccss/example-2.c
==============================================================================
--- trunk/libccss/cccss/example-2.c	(original)
+++ trunk/libccss/cccss/example-2.c	Fri Oct  3 08:07:16 2008
@@ -65,7 +65,6 @@
       char	**argv)
 {
 	ClutterActor		*stage;
-	ClutterActor		*actor;
 	ccss_stylesheet_t	*stylesheet;
 	ClutterColor		 stage_color = { 0x00, 0x00, 0x00, 0xff };
 	const char 		*names[] = { "foo", "bar", "baz", "qux", "mos" };

Modified: trunk/libccss/cccss/example-2.css
==============================================================================
--- trunk/libccss/cccss/example-2.css	(original)
+++ trunk/libccss/cccss/example-2.css	Fri Oct  3 08:07:16 2008
@@ -23,3 +23,14 @@
 	border: 5px solid white;
 	border-radius: 50%;
 }
+
+actor#mos {
+	background-image: url(foo.svg);
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: contain;
+	background-color: kakhi;
+	border: 2px solid blue;
+	border-radius: 50%;
+}
+

Modified: trunk/src/gce-rc-style.c
==============================================================================
--- trunk/src/gce-rc-style.c	(original)
+++ trunk/src/gce-rc-style.c	Fri Oct  3 08:07:16 2008
@@ -59,7 +59,6 @@
 	static GQuark scope_id = 0;
 
 	char	*gce_file;
-	char	*rc_string;
 	guint	 old_scope;
 	guint	 token;
 		
@@ -85,11 +84,14 @@
 				scanner, scanner->value.v_string);
 		_stylesheet = ccss_stylesheet_new_from_file (gce_file);
 #ifdef GCE_RAPID_DEVELOPMENT
+		G_STMT_START
+		char *rc_string;
 		rc_string = gce_serialize (_stylesheet);
 		if (rc_string) {
 			gtk_rc_parse_string (rc_string);
 			g_free (rc_string), rc_string = NULL;
 		}
+		G_STMT_END
 #endif
 		_stylesheet_owner = (gpointer) rc_style;
 		g_free (gce_file), gce_file = NULL;