librsvg r1199 - in trunk: . gdk-pixbuf-loader gtk-engine

[doml svn gnome org]

Author: doml
Date: Thu Feb 19 23:21:09 2009
New Revision: 1199
URL: http://svn.gnome.org/viewvc/librsvg?rev=1199&view=rev

Log:
2009-02-19  Luis Menina  <liberforce freeside fr>

        * *: GNOME Goal: Clean up GLib and GTK+ includes. Bug #563789



Modified:
   trunk/ChangeLog
   trunk/gdk-pixbuf-loader/io-svg.c
   trunk/gtk-engine/svg-rc-style.h
   trunk/gtk-engine/svg-style.h
   trunk/rsvg-bpath-util.c
   trunk/rsvg-bpath-util.h
   trunk/rsvg-cairo-render.c
   trunk/rsvg-css.h
   trunk/rsvg-defs.c
   trunk/rsvg-defs.h
   trunk/rsvg-paint-server.c
   trunk/rsvg-paint-server.h
   trunk/rsvg-path.c
   trunk/rsvg-private.h

Modified: trunk/gdk-pixbuf-loader/io-svg.c
==============================================================================
--- trunk/gdk-pixbuf-loader/io-svg.c	(original)
+++ trunk/gdk-pixbuf-loader/io-svg.c	Thu Feb 19 23:21:09 2009
@@ -24,7 +24,6 @@
 #include <rsvg.h>
 #include <stdlib.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk-pixbuf/gdk-pixbuf-io.h>
 #include "rsvg-private.h"
 
 typedef struct {

Modified: trunk/gtk-engine/svg-rc-style.h
==============================================================================
--- trunk/gtk-engine/svg-rc-style.h	(original)
+++ trunk/gtk-engine/svg-rc-style.h	Thu Feb 19 23:21:09 2009
@@ -21,7 +21,7 @@
  * Carsten Haitzler <raster rasterman com>
  */
 
-#include <gtk/gtkrc.h>
+#include <gtk/gtk.h>
 
 typedef struct _RsvgRcStyle RsvgRcStyle;
 typedef struct _RsvgRcStyleClass RsvgRcStyleClass;

Modified: trunk/gtk-engine/svg-style.h
==============================================================================
--- trunk/gtk-engine/svg-style.h	(original)
+++ trunk/gtk-engine/svg-style.h	Thu Feb 19 23:21:09 2009
@@ -21,7 +21,7 @@
  * Carsten Haitzler <raster rasterman com>
  */
 
-#include <gtk/gtkstyle.h>
+#include <gtk/gtk.h>
 
 typedef struct _RsvgStyle RsvgStyle;
 typedef struct _RsvgStyleClass RsvgStyleClass;

Modified: trunk/rsvg-bpath-util.c
==============================================================================
--- trunk/rsvg-bpath-util.c	(original)
+++ trunk/rsvg-bpath-util.c	Thu Feb 19 23:21:09 2009
@@ -29,8 +29,7 @@
 #include <math.h>
 #include <string.h>
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 /* This is adapted from gnome-canvas-bpath-util in libgnomeprint
    (originally developed as part of Gill). */

Modified: trunk/rsvg-bpath-util.h
==============================================================================
--- trunk/rsvg-bpath-util.h	(original)
+++ trunk/rsvg-bpath-util.h	Thu Feb 19 23:21:09 2009
@@ -26,7 +26,7 @@
 #ifndef RSVG_BPATH_UTIL_H
 #define RSVG_BPATH_UTIL_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS 
 typedef enum {

Modified: trunk/rsvg-cairo-render.c
==============================================================================
--- trunk/rsvg-cairo-render.c	(original)
+++ trunk/rsvg-cairo-render.c	Thu Feb 19 23:21:09 2009
@@ -26,7 +26,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <math.h>
 #include <string.h>
 

Modified: trunk/rsvg-css.h
==============================================================================
--- trunk/rsvg-css.h	(original)
+++ trunk/rsvg-css.h	Thu Feb 19 23:21:09 2009
@@ -25,7 +25,7 @@
 #ifndef RSVG_CSS_H
 #define RSVG_CSS_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <pango/pango.h>
 #include "rsvg-private.h"
 

Modified: trunk/rsvg-defs.c
==============================================================================
--- trunk/rsvg-defs.c	(original)
+++ trunk/rsvg-defs.c	Thu Feb 19 23:21:09 2009
@@ -28,11 +28,7 @@
 #include "rsvg-styles.h"
 #include "rsvg-image.h"
 
-#include <glib/ghash.h>
-#include <glib/gmem.h>
-#include <glib/gslist.h>
-#include <glib/gstrfuncs.h>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 struct _RsvgDefs {
     GHashTable *hash;

Modified: trunk/rsvg-defs.h
==============================================================================
--- trunk/rsvg-defs.h	(original)
+++ trunk/rsvg-defs.h	Thu Feb 19 23:21:09 2009
@@ -28,7 +28,7 @@
 
 /* A module for handling SVG defs */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 G_BEGIN_DECLS 
 

Modified: trunk/rsvg-paint-server.c
==============================================================================
--- trunk/rsvg-paint-server.c	(original)
+++ trunk/rsvg-paint-server.c	Thu Feb 19 23:21:09 2009
@@ -29,9 +29,7 @@
 #include "rsvg-styles.h"
 #include "rsvg-image.h"
 
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <string.h>
 #include <math.h>
 

Modified: trunk/rsvg-paint-server.h
==============================================================================
--- trunk/rsvg-paint-server.h	(original)
+++ trunk/rsvg-paint-server.h	Thu Feb 19 23:21:09 2009
@@ -26,7 +26,7 @@
 #ifndef RSVG_PAINT_SERVER_H
 #define RSVG_PAINT_SERVER_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include "rsvg-defs.h"
 
 G_BEGIN_DECLS 

Modified: trunk/rsvg-path.c
==============================================================================
--- trunk/rsvg-path.c	(original)
+++ trunk/rsvg-path.c	Thu Feb 19 23:21:09 2009
@@ -27,7 +27,7 @@
 #include "config.h"
 #include "rsvg-path.h"
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>

Modified: trunk/rsvg-private.h
==============================================================================
--- trunk/rsvg-private.h	(original)
+++ trunk/rsvg-private.h	Thu Feb 19 23:21:09 2009
@@ -32,7 +32,7 @@
 #include <libxml/SAX.h>
 #include <libxml/xmlmemory.h>
 #include <pango/pango.h>
-#include <glib/gslist.h>
+#include <glib.h>
 #include <glib-object.h>
 #include <math.h>