gtk-css-engine r197 - in trunk: . src themes/gtk-css-test/gtk-2.0

[robsta svn gnome org]

Author: robsta
Date: Mon Nov 24 20:28:16 2008
New Revision: 197
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=197&view=rev

Log:
* configure.in:
* src/gce-functions.h:
* src/gce-node.c:
* src/gce-properties.c:
* src/gce-properties.h:
* src/gce-rc-style.h:
* src/gce-serialize.h:
* src/gce-theme.c:
* themes/gtk-css-test/gtk-2.0/styles.css:
Fix after ccss-clutter split-out.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/gce-functions.h
   trunk/src/gce-node.c
   trunk/src/gce-properties.c
   trunk/src/gce-properties.h
   trunk/src/gce-rc-style.h
   trunk/src/gce-serialize.h
   trunk/src/gce-theme.c
   trunk/themes/gtk-css-test/gtk-2.0/styles.css

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Nov 24 20:28:16 2008
@@ -95,7 +95,7 @@
 ### Checks for libraries. ######################################################
 
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
-pkgs='libccss-gtk-1 >= 0.2'
+pkgs='gtk+-2.0 >= 2.10 libccss-cairo-1 >= 0.2'
 
 AC_MSG_CHECKING([for svg support in libccss])
 with_rsvg=`$PKG_CONFIG --variable=ccss_with_rsvg libccss-1`

Modified: trunk/src/gce-functions.h
==============================================================================
--- trunk/src/gce-functions.h	(original)
+++ trunk/src/gce-functions.h	Mon Nov 24 20:28:16 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_FUNCTIONS_H
 #define GCE_FUNCTIONS_H
 
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gce-node.c
==============================================================================
--- trunk/src/gce-node.c	(original)
+++ trunk/src/gce-node.c	Mon Nov 24 20:28:16 2008
@@ -18,7 +18,7 @@
  */
 
 #include <string.h>
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 #include "gce-maps.h"
 #include "gce-node.h"
 

Modified: trunk/src/gce-properties.c
==============================================================================
--- trunk/src/gce-properties.c	(original)
+++ trunk/src/gce-properties.c	Mon Nov 24 20:28:16 2008
@@ -17,6 +17,7 @@
  * MA 02110-1301, USA.
  */
 
+#include <gtk/gtk.h>
 #include "gce-properties.h"
 
 typedef struct {

Modified: trunk/src/gce-properties.h
==============================================================================
--- trunk/src/gce-properties.h	(original)
+++ trunk/src/gce-properties.h	Mon Nov 24 20:28:16 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_PROPERTIES_H
 #define GCE_PROPERTIES_H
 
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gce-rc-style.h
==============================================================================
--- trunk/src/gce-rc-style.h	(original)
+++ trunk/src/gce-rc-style.h	Mon Nov 24 20:28:16 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_RC_STYLE_H
 #define GCE_RC_STYLE_H
 
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 #include <glib.h>
 #include <glib-object.h>
 

Modified: trunk/src/gce-serialize.h
==============================================================================
--- trunk/src/gce-serialize.h	(original)
+++ trunk/src/gce-serialize.h	Mon Nov 24 20:28:16 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_PARSER_H
 #define GCE_PARSER_H
 
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

Modified: trunk/src/gce-theme.c
==============================================================================
--- trunk/src/gce-theme.c	(original)
+++ trunk/src/gce-theme.c	Mon Nov 24 20:28:16 2008
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include <ccss-gtk/ccss-gtk.h>
+#include <ccss-cairo/ccss-cairo.h>
 #include <gmodule.h>
 #include <gtk/gtk.h>
 

Modified: trunk/themes/gtk-css-test/gtk-2.0/styles.css
==============================================================================
--- trunk/themes/gtk-css-test/gtk-2.0/styles.css	(original)
+++ trunk/themes/gtk-css-test/gtk-2.0/styles.css	Mon Nov 24 20:28:16 2008
@@ -8,10 +8,8 @@
 
 * {
 	background-color: gtk-color(bg_color);
-	color: black;
 }
 
-/*
 arrow {
 	background-position: center;
 	background-repeat: no-repeat;
@@ -151,4 +149,4 @@
 GtkButton:normal {
 	background-color: darkkhaki;
 }
-*/
+