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

[robsta svn gnome org]

Author: robsta
Date: Fri Nov  7 16:37:52 2008
New Revision: 186
URL: http://svn.gnome.org/viewvc/gtk-css-engine?rev=186&view=rev

Log:
* configure.in:
* src/gce-functions.c (url):
* src/gce-node.c:
Depend on libccss' usage of libsoup.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/gce-functions.c
   trunk/src/gce-node.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Nov  7 16:37:52 2008
@@ -105,21 +105,6 @@
   AC_MSG_WARN([libccss without rsvg support, SVG images will not be supported])
 fi
 
-soup_req='libsoup-2.4'
-PKG_CHECK_EXISTS([ $soup_req ],
-[
-  with_soup="yes"
-  pkgs="$pkgs $soup_req"
-],[
-  with_soup="no"
-])
-
-if test "$with_soup" = "yes"; then
-  AC_DEFINE([GCE_WITH_SOUP], [1], [URI parsing support through libsoup])
-fi
-AM_CONDITIONAL([GCE_WITH_SOUP], [test "$with_soup" = "yes"])
-
-
 PKG_CHECK_MODULES(GCE, $pkgs)
 
 AC_SUBST([GCE_CFLAGS])
@@ -180,7 +165,6 @@
     CFLAGS                       ${CFLAGS}
     Build debugging code         $enable_debug
     Support for SVG images       $with_rsvg (requires libccss with svg support)
-WIP Support for SVG fragments    $with_soup (requires libsoup)
 
 Theme engine:
     Rapid development            $enable_rapid_development (WARNING: this breaks theme switching)

Modified: trunk/src/gce-functions.c
==============================================================================
--- trunk/src/gce-functions.c	(original)
+++ trunk/src/gce-functions.c	Fri Nov  7 16:37:52 2008
@@ -18,8 +18,9 @@
  */
 
 #include <gtk/gtk.h>
+#include <ccss/ccss.h>
 
-#ifdef GCE_WITH_SOUP
+#ifdef CCSS_WITH_SOUP
 #include <libsoup/soup.h>
 #endif
 
@@ -34,7 +35,7 @@
 {
 	char		*resolved_path;
 	char		*ret;
-#ifdef GCE_WITH_SOUP
+#ifdef CCSS_WITH_SOUP
 	char		*given_path;
 	SoupURI		*uri;
 

Modified: trunk/src/gce-node.c
==============================================================================
--- trunk/src/gce-node.c	(original)
+++ trunk/src/gce-node.c	Fri Nov  7 16:37:52 2008
@@ -21,9 +21,6 @@
 #include <ccss-gtk/ccss-gtk.h>
 #include "gce-node.h"
 
-/*
- * TODO: split into load- and run-time variants?
- */
 struct GceNode_ {
 	ccss_node_t		 parent;
 	GtkWidget		*widget;