gtk-css-engine r132 - in trunk: . libccd/ccd

[robsta svn gnome org]

Author: robsta
Date: Fri Sep 26 15:08:21 2008
New Revision: 132
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=132&view=rev

Log:
* TODO: remember how to handle drawing w/o widget pointer.
* configure.in:
* libccd/ccd/ccd-parser.c:
Detect defective libcroco versions and conditionally work around bug #553937.


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/TODO
   trunk/configure.in
   trunk/libccd/ccd/ccd-parser.c

Modified: trunk/TODO
==============================================================================
--- trunk/TODO	(original)
+++ trunk/TODO	Fri Sep 26 15:08:21 2008
@@ -10,8 +10,8 @@
   single `background-size: <length>;' there.
 * Background attachment.
 * Add a parse run in the engine to set up GtkStyle correctly.
-* Gilouche-CSS theme pretty much matches the original.
-* Bugzilla module.
+* Store type-name, type-id and selector-group in the GtkStyle and use that
+  information if no widget is passed.
 
 Done:
 * Border radius.
@@ -37,6 +37,7 @@
 -- Theme --
 * Use actual borders for checks and options, make them use 100% of the 
   allocated space.
+* Gilouche-CSS theme pretty much matches the original.
 
 0.3 "Features"
 --------------
@@ -69,6 +70,7 @@
   an opaque "unsigned char[x]". Install only a minimal number of of required
   headers (ccd, stylesheet, selector-group, style*, node).
 * Think about per-stylesheet node-class and functions interface.
+* Bugzilla module.
 
 0.5 "Performance"
 -----------------

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Sep 26 15:08:21 2008
@@ -9,6 +9,9 @@
 m4_define([ccd_version_major], [0])
 m4_define([ccd_version_minor], [2])
 m4_define([ccd_version_micro], [0])
+### For the release:
+# m4_define([ccd_version_extra], [])
+### On trunk:
 m4_define([ccd_version_extra], [.trunk])
 m4_define([ccd_version],
     [ccd_version_major.ccd_version_minor.ccd_version_micro[]ccd_version_extra])
@@ -110,6 +113,17 @@
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
 pkgs='gtk+-2.0 >= 2.10.0 libcroco-0.6'
 
+# See http://bugzilla.gnome.org/show_bug.cgi?id=553937 .
+PKG_CHECK_EXISTS([ libcroco-0.6 >= 0.6.2 ],
+[
+  enable_libcroco_workaround="no"
+],[
+  enable_libcroco_workaround="yes"
+])
+if test "$enable_libcroco_workaround" = "yes"; then
+  AC_DEFINE([CCD_ENABLE_LIBCROCO_WORKAROUND], [1], [Work around libcroco issue #553937])
+fi
+
 # Guessing a version.
 rsvg_req='librsvg-2.0 >= 2.16'
 PKG_CHECK_EXISTS([ $rsvg_req ],

Modified: trunk/libccd/ccd/ccd-parser.c
==============================================================================
--- trunk/libccd/ccd/ccd-parser.c	(original)
+++ trunk/libccd/ccd/ccd-parser.c	Fri Sep 26 15:08:21 2008
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <libcroco/libcroco.h>
+#include "config.h"
 #include "ccd-block.h"
 #include "ccd-color.h"
 #include "ccd-parser.h"
@@ -268,8 +269,10 @@
 		g_warning ("Parsing failed but all I can offer for consolation is this: %d\n", ret);
 	}
 
-	/* See http://bugzilla.gnome.org/show_bug.cgi?id=553937 .
-	 * cr_doc_handler_unref (handler), handler = NULL; */
+/* See http://bugzilla.gnome.org/show_bug.cgi?id=553937 . */
+#ifndef CCD_ENABLE_LIBCROCO_WORKAROUND
+	cr_doc_handler_unref (handler), handler = NULL;
+#endif
 	cr_parser_destroy (parser), parser = NULL;
 
 	return info.blocks;