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

[robsta svn gnome org]

Author: robsta
Date: Fri Nov  7 15:39:38 2008
New Revision: 185
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=185&view=rev

Log:
* configure.in:
* src/css2gtkrc.c:
* src/gce-functions.c (url):
* src/gce-functions.h:
* src/gce-node.c:
* src/gce-node.h:
* src/gce-rc-style.h:
* src/gce-serialize.h:
* src/gce-style.h:
* src/gce-theme.c:
Fix after libccss-gtk split out.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/css2gtkrc.c
   trunk/src/gce-functions.c
   trunk/src/gce-functions.h
   trunk/src/gce-node.c
   trunk/src/gce-node.h
   trunk/src/gce-rc-style.h
   trunk/src/gce-serialize.h
   trunk/src/gce-style.h
   trunk/src/gce-theme.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov  7 15:39:38 2008
@@ -95,15 +95,7 @@
 ### Checks for libraries. ######################################################
 
 # Maybe it would work with gtk+-2.8, the first sporting cairo, right?
-pkgs='libccss-1'
-
-AC_MSG_CHECKING([for gtk support in libccss])
-with_gtk=`$PKG_CONFIG --variable=ccss_with_gtk libccss-1`
-if test "$with_gtk" == "yes"; then
-  AC_MSG_RESULT([$with_gtk])
-else
-  AC_MSG_ERROR([libccss without gtk support, not sufficient for gtk-css-engine])
-fi
+pkgs='libccss-gtk-1 >= 0.2'
 
 AC_MSG_CHECKING([for gtk support in libccss])
 with_rsvg=`$PKG_CONFIG --variable=ccss_with_rsvg libccss-1`

Modified: trunk/src/css2gtkrc.c
==============================================================================
--- trunk/src/css2gtkrc.c	(original)
+++ trunk/src/css2gtkrc.c	Fri Nov  7 15:39:38 2008
@@ -17,7 +17,6 @@
  * MA 02110-1301, USA.
  */
 
-#include <ccss/ccss.h>
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>

Modified: trunk/src/gce-functions.c
==============================================================================
--- trunk/src/gce-functions.c	(original)
+++ trunk/src/gce-functions.c	Fri Nov  7 15:39:38 2008
@@ -17,11 +17,9 @@
  * MA 02110-1301, USA.
  */
 
-#include <ccss/ccss.h>
 #include <gtk/gtk.h>
 
-/* Need the ccss include above for the feature defs. */
-#ifdef CCSS_WITH_SOUP
+#ifdef GCE_WITH_SOUP
 #include <libsoup/soup.h>
 #endif
 
@@ -34,10 +32,10 @@
 static char *
 url (GSList const *args)
 {
-	char		*given_path;
 	char		*resolved_path;
 	char		*ret;
-#ifdef CCSS_WITH_SOUP
+#ifdef GCE_WITH_SOUP
+	char		*given_path;
 	SoupURI		*uri;
 
 	g_return_val_if_fail (args, NULL);
@@ -53,6 +51,8 @@
 	ret = soup_uri_to_string (uri, FALSE);
 	soup_uri_free (uri), uri = NULL;
 #else
+	char const *given_path;
+
 	g_return_val_if_fail (args, NULL);
 
 	given_path = (char const *) args->data;

Modified: trunk/src/gce-functions.h
==============================================================================
--- trunk/src/gce-functions.h	(original)
+++ trunk/src/gce-functions.h	Fri Nov  7 15:39:38 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_FUNCTIONS_H
 #define GCE_FUNCTIONS_H
 
-#include <ccss/ccss.h>
+#include <ccss-gtk/ccss-gtk.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/src/gce-node.c
==============================================================================
--- trunk/src/gce-node.c	(original)
+++ trunk/src/gce-node.c	Fri Nov  7 15:39:38 2008
@@ -18,6 +18,7 @@
  */
 
 #include <string.h>
+#include <ccss-gtk/ccss-gtk.h>
 #include "gce-node.h"
 
 /*

Modified: trunk/src/gce-node.h
==============================================================================
--- trunk/src/gce-node.h	(original)
+++ trunk/src/gce-node.h	Fri Nov  7 15:39:38 2008
@@ -20,7 +20,6 @@
 #ifndef GCE_NODE_H
 #define GCE_NODE_H
 
-#include <ccss/ccss.h>
 #include <glib.h>
 #include <gtk/gtk.h>
 

Modified: trunk/src/gce-rc-style.h
==============================================================================
--- trunk/src/gce-rc-style.h	(original)
+++ trunk/src/gce-rc-style.h	Fri Nov  7 15:39:38 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_RC_STYLE_H
 #define GCE_RC_STYLE_H
 
-#include <ccss/ccss.h>
+#include <ccss-gtk/ccss-gtk.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	Fri Nov  7 15:39:38 2008
@@ -20,7 +20,7 @@
 #ifndef GCE_PARSER_H
 #define GCE_PARSER_H
 
-#include <ccss/ccss.h>
+#include <ccss-gtk/ccss-gtk.h>
 #include <glib.h>
 
 G_BEGIN_DECLS

Modified: trunk/src/gce-style.h
==============================================================================
--- trunk/src/gce-style.h	(original)
+++ trunk/src/gce-style.h	Fri Nov  7 15:39:38 2008
@@ -20,7 +20,6 @@
 #ifndef GCE_STYLE_H
 #define GCE_STYLE_H
 
-#include <ccss/ccss.h>
 #include <glib.h>
 #include <glib-object.h>
 

Modified: trunk/src/gce-theme.c
==============================================================================
--- trunk/src/gce-theme.c	(original)
+++ trunk/src/gce-theme.c	Fri Nov  7 15:39:38 2008
@@ -17,7 +17,7 @@
  * MA 02110-1301, USA.
  */
 
-#include <ccss/ccss.h>
+#include <ccss-gtk/ccss-gtk.h>
 #include <gmodule.h>
 #include <gtk/gtk.h>