gimp r25341 - in trunk: . app/pdb tools/pdbgen

[neo svn gnome org]

Author: neo
Date: Wed Apr  2 21:50:16 2008
New Revision: 25341
URL: http://svn.gnome.org/viewvc/gimp?rev=25341&view=rev

Log:
2008-04-02  Sven Neumann  <sven gimp org>

	* tools/pdbgen/app.pl: special treatment for gimppdberror.h to 
get
	a saner include order.

	* app/pdb/floating_sel_cmds.c
	* app/pdb/image_cmds.c: regenerated.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/floating_sel_cmds.c
   trunk/app/pdb/image_cmds.c
   trunk/tools/pdbgen/app.pl

Modified: trunk/app/pdb/floating_sel_cmds.c
==============================================================================
--- trunk/app/pdb/floating_sel_cmds.c	(original)
+++ trunk/app/pdb/floating_sel_cmds.c	Wed Apr  2 21:50:16 2008
@@ -28,9 +28,9 @@
 #include "core/gimplayer-floating-sel.h"
 #include "core/gimplayer.h"
 #include "core/gimpparamspecs.h"
-#include "gimppdberror.h"
 
 #include "gimppdb.h"
+#include "gimppdberror.h"
 #include "gimppdb-utils.h"
 #include "gimpprocedure.h"
 #include "internal_procs.h"

Modified: trunk/app/pdb/image_cmds.c
==============================================================================
--- trunk/app/pdb/image_cmds.c	(original)
+++ trunk/app/pdb/image_cmds.c	Wed Apr  2 21:50:16 2008
@@ -50,10 +50,10 @@
 #include "core/gimppickable.h"
 #include "core/gimpselection.h"
 #include "core/gimpunit.h"
-#include "gimppdberror.h"
 #include "vectors/gimpvectors.h"
 
 #include "gimppdb.h"
+#include "gimppdberror.h"
 #include "gimpprocedure.h"
 #include "internal_procs.h"
 

Modified: trunk/tools/pdbgen/app.pl
==============================================================================
--- trunk/tools/pdbgen/app.pl	(original)
+++ trunk/tools/pdbgen/app.pl	Wed Apr  2 21:50:16 2008
@@ -694,8 +694,9 @@
 	my $seen = 0;
 	my $sys = 0;
 	my $base = 0;
-	my $intl = 0;
+	my $error = 0;
 	my $utils = 0;
+	my $intl = 0;
 
 	foreach (@headers) {
 	    $seen++ if /^</;
@@ -727,6 +728,9 @@
 	    elsif (/gimppdb-utils/) {
 		$utils = 1;
 	    }
+	    elsif (/gimppdberror/) {
+		$error = 1;
+	    }
 	    else {
 		$headers .= "#include $_\n";
 	    }
@@ -734,6 +738,7 @@
 
 	$headers .= "\n";
 	$headers .= "#include \"gimppdb.h\"\n";
+	$headers .= "#include \"gimppdberror.h\"\n" if $error;
 	$headers .= "#include \"gimppdb-utils.h\"\n" if $utils;
 	$headers .= "#include \"gimpprocedure.h\"\n";
 	$headers .= "#include \"internal_procs.h\"\n";