gimp r24685 - in trunk: . app/actions app/display app/tools

[mitch svn gnome org]

Author: mitch
Date: Wed Jan 23 09:51:43 2008
New Revision: 24685
URL: http://svn.gnome.org/viewvc/gimp?rev=24685&view=rev

Log:
2008-01-23  Michael Natterer  <mitch gimp org>

	* app/tools/gimpimagemaptool.h: don't #include <gegl.h>

	* app/actions/tools-commands.c
	* app/display/gimpdisplayshell-callbacks.c
	* app/tools/gimp-tools.c: include it here. Whenever the build
	breaks because of some GEGL change in GIMP, please inlcude
	<gegl.h> instead of <glib-object.h> or before <gtk/gtk.h> in the
	affected .c files.



Modified:
   trunk/ChangeLog
   trunk/app/actions/tools-commands.c
   trunk/app/display/gimpdisplayshell-callbacks.c
   trunk/app/tools/gimp-tools.c
   trunk/app/tools/gimpimagemaptool.h

Modified: trunk/app/actions/tools-commands.c
==============================================================================
--- trunk/app/actions/tools-commands.c	(original)
+++ trunk/app/actions/tools-commands.c	Wed Jan 23 09:51:43 2008
@@ -20,6 +20,7 @@
 
 #include <string.h>
 
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "actions-types.h"

Modified: trunk/app/display/gimpdisplayshell-callbacks.c
==============================================================================
--- trunk/app/display/gimpdisplayshell-callbacks.c	(original)
+++ trunk/app/display/gimpdisplayshell-callbacks.c	Wed Jan 23 09:51:43 2008
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 
+#include <gegl.h>
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 

Modified: trunk/app/tools/gimp-tools.c
==============================================================================
--- trunk/app/tools/gimp-tools.c	(original)
+++ trunk/app/tools/gimp-tools.c	Wed Jan 23 09:51:43 2008
@@ -18,6 +18,7 @@
 
 #include "config.h"
 
+#include <gegl.h>
 #include <gtk/gtk.h>
 
 #include "libgimpbase/gimpbase.h"

Modified: trunk/app/tools/gimpimagemaptool.h
==============================================================================
--- trunk/app/tools/gimpimagemaptool.h	(original)
+++ trunk/app/tools/gimpimagemaptool.h	Wed Jan 23 09:51:43 2008
@@ -19,12 +19,6 @@
 #ifndef  __GIMP_IMAGE_MAP_TOOL_H__
 #define  __GIMP_IMAGE_MAP_TOOL_H__
 
-#ifndef __GEGL_H__
-#ifdef __GNUC__
-#warning FIXME: dont include gegl.h here
-#endif
-#include <gegl.h>
-#endif /* __GEGL_H__ */
 
 #include "gimpcolortool.h"