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



Author: mitch
Date: Thu Feb  7 17:08:54 2008
New Revision: 24829
URL: http://svn.gnome.org/viewvc/gimp?rev=24829&view=rev

Log:
2008-02-07  Michael Natterer  <mitch gimp org>

	* tools/pdbgen/app.pl: add some perl evilness to make the includes
	in the generated files look almost like they should.

	* tools/pdbgen/pdb/*.pdb: remove inclusion of "core/gimp.h" where
	not needed, clean up lists of includes and functions and reorder
	some functions to make more sense. Zero logic changed.

	* app/pdb/*_cmds.c
	* libgimp/gimpcontext_pdb.[ch]
	* libgimp/gimpbrush_pdb.[ch]: regenerated.



Modified:
   trunk/ChangeLog
   trunk/app/pdb/brush_cmds.c
   trunk/app/pdb/brush_select_cmds.c
   trunk/app/pdb/brushes_cmds.c
   trunk/app/pdb/buffer_cmds.c
   trunk/app/pdb/channel_cmds.c
   trunk/app/pdb/color_cmds.c
   trunk/app/pdb/context_cmds.c
   trunk/app/pdb/convert_cmds.c
   trunk/app/pdb/display_cmds.c
   trunk/app/pdb/drawable_cmds.c
   trunk/app/pdb/drawable_transform_cmds.c
   trunk/app/pdb/edit_cmds.c
   trunk/app/pdb/fileops_cmds.c
   trunk/app/pdb/floating_sel_cmds.c
   trunk/app/pdb/font_select_cmds.c
   trunk/app/pdb/fonts_cmds.c
   trunk/app/pdb/gimprc_cmds.c
   trunk/app/pdb/gradient_cmds.c
   trunk/app/pdb/gradient_select_cmds.c
   trunk/app/pdb/gradients_cmds.c
   trunk/app/pdb/grid_cmds.c
   trunk/app/pdb/guides_cmds.c
   trunk/app/pdb/help_cmds.c
   trunk/app/pdb/image_cmds.c
   trunk/app/pdb/layer_cmds.c
   trunk/app/pdb/message_cmds.c
   trunk/app/pdb/misc_cmds.c
   trunk/app/pdb/paint_tools_cmds.c
   trunk/app/pdb/palette_cmds.c
   trunk/app/pdb/palette_select_cmds.c
   trunk/app/pdb/palettes_cmds.c
   trunk/app/pdb/parasite_cmds.c
   trunk/app/pdb/paths_cmds.c
   trunk/app/pdb/pattern_cmds.c
   trunk/app/pdb/pattern_select_cmds.c
   trunk/app/pdb/patterns_cmds.c
   trunk/app/pdb/plug_in_cmds.c
   trunk/app/pdb/procedural_db_cmds.c
   trunk/app/pdb/progress_cmds.c
   trunk/app/pdb/selection_cmds.c
   trunk/app/pdb/selection_tools_cmds.c
   trunk/app/pdb/text_tool_cmds.c
   trunk/app/pdb/transform_tools_cmds.c
   trunk/app/pdb/undo_cmds.c
   trunk/app/pdb/unit_cmds.c
   trunk/app/pdb/vectors_cmds.c
   trunk/tools/pdbgen/app.pl
   trunk/tools/pdbgen/pdb/brush.pdb
   trunk/tools/pdbgen/pdb/brush_select.pdb
   trunk/tools/pdbgen/pdb/brushes.pdb
   trunk/tools/pdbgen/pdb/buffer.pdb
   trunk/tools/pdbgen/pdb/channel.pdb
   trunk/tools/pdbgen/pdb/context.pdb
   trunk/tools/pdbgen/pdb/convert.pdb
   trunk/tools/pdbgen/pdb/display.pdb
   trunk/tools/pdbgen/pdb/drawable.pdb
   trunk/tools/pdbgen/pdb/drawable_transform.pdb
   trunk/tools/pdbgen/pdb/edit.pdb
   trunk/tools/pdbgen/pdb/fileops.pdb
   trunk/tools/pdbgen/pdb/font_select.pdb
   trunk/tools/pdbgen/pdb/fonts.pdb
   trunk/tools/pdbgen/pdb/gimprc.pdb
   trunk/tools/pdbgen/pdb/gradient.pdb
   trunk/tools/pdbgen/pdb/gradient_select.pdb
   trunk/tools/pdbgen/pdb/gradients.pdb
   trunk/tools/pdbgen/pdb/image.pdb
   trunk/tools/pdbgen/pdb/layer.pdb
   trunk/tools/pdbgen/pdb/message.pdb
   trunk/tools/pdbgen/pdb/misc.pdb
   trunk/tools/pdbgen/pdb/paint_tools.pdb
   trunk/tools/pdbgen/pdb/palette.pdb
   trunk/tools/pdbgen/pdb/palette_select.pdb
   trunk/tools/pdbgen/pdb/palettes.pdb
   trunk/tools/pdbgen/pdb/paths.pdb
   trunk/tools/pdbgen/pdb/pattern.pdb
   trunk/tools/pdbgen/pdb/pattern_select.pdb
   trunk/tools/pdbgen/pdb/patterns.pdb
   trunk/tools/pdbgen/pdb/plug_in.pdb
   trunk/tools/pdbgen/pdb/procedural_db.pdb
   trunk/tools/pdbgen/pdb/progress.pdb
   trunk/tools/pdbgen/pdb/transform_tools.pdb
   trunk/tools/pdbgen/pdb/vectors.pdb

Modified: trunk/app/pdb/brush_cmds.c
==============================================================================
--- trunk/app/pdb/brush_cmds.c	(original)
+++ trunk/app/pdb/brush_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,9 +25,6 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
 #include "core/gimp.h"
@@ -35,8 +32,11 @@
 #include "core/gimpbrushgenerated.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 
@@ -453,26 +453,32 @@
 }
 
 static GValueArray *
-brush_get_radius_invoker (GimpProcedure      *procedure,
-                          Gimp               *gimp,
-                          GimpContext        *context,
-                          GimpProgress       *progress,
-                          const GValueArray  *args,
-                          GError            **error)
+brush_set_shape_invoker (GimpProcedure      *procedure,
+                         Gimp               *gimp,
+                         GimpContext        *context,
+                         GimpProgress       *progress,
+                         const GValueArray  *args,
+                         GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble radius = 0.0;
+  gint32 shape_in;
+  gint32 shape_out = 0;
 
   name = g_value_get_string (&args->values[0]);
+  shape_in = g_value_get_enum (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
 
       if (brush)
-        radius = GIMP_BRUSH_GENERATED (brush)->radius;
+        {
+          gimp_brush_generated_set_shape (GIMP_BRUSH_GENERATED (brush),
+                                          shape_in);
+          shape_out = GIMP_BRUSH_GENERATED (brush)->shape;
+        }
       else
         success = FALSE;
     }
@@ -480,13 +486,13 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], radius);
+    g_value_set_enum (&return_vals->values[1], shape_out);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_get_spikes_invoker (GimpProcedure      *procedure,
+brush_get_radius_invoker (GimpProcedure      *procedure,
                           Gimp               *gimp,
                           GimpContext        *context,
                           GimpProgress       *progress,
@@ -496,7 +502,7 @@
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gint32 spikes = 0;
+  gdouble radius = 0.0;
 
   name = g_value_get_string (&args->values[0]);
 
@@ -505,7 +511,7 @@
       GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
 
       if (brush)
-        spikes = GIMP_BRUSH_GENERATED (brush)->spikes;
+        radius = GIMP_BRUSH_GENERATED (brush)->radius;
       else
         success = FALSE;
     }
@@ -513,32 +519,38 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_int (&return_vals->values[1], spikes);
+    g_value_set_double (&return_vals->values[1], radius);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_get_hardness_invoker (GimpProcedure      *procedure,
-                            Gimp               *gimp,
-                            GimpContext        *context,
-                            GimpProgress       *progress,
-                            const GValueArray  *args,
-                            GError            **error)
+brush_set_radius_invoker (GimpProcedure      *procedure,
+                          Gimp               *gimp,
+                          GimpContext        *context,
+                          GimpProgress       *progress,
+                          const GValueArray  *args,
+                          GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble hardness = 0.0;
+  gdouble radius_in;
+  gdouble radius_out = 0.0;
 
   name = g_value_get_string (&args->values[0]);
+  radius_in = g_value_get_double (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
 
       if (brush)
-        hardness = GIMP_BRUSH_GENERATED (brush)->hardness;
+        {
+          gimp_brush_generated_set_radius (GIMP_BRUSH_GENERATED (brush),
+                                           radius_in);
+          radius_out = GIMP_BRUSH_GENERATED (brush)->radius;
+        }
       else
         success = FALSE;
     }
@@ -546,23 +558,23 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], hardness);
+    g_value_set_double (&return_vals->values[1], radius_out);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_get_aspect_ratio_invoker (GimpProcedure      *procedure,
-                                Gimp               *gimp,
-                                GimpContext        *context,
-                                GimpProgress       *progress,
-                                const GValueArray  *args,
-                                GError            **error)
+brush_get_spikes_invoker (GimpProcedure      *procedure,
+                          Gimp               *gimp,
+                          GimpContext        *context,
+                          GimpProgress       *progress,
+                          const GValueArray  *args,
+                          GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble aspect_ratio = 0.0;
+  gint32 spikes = 0;
 
   name = g_value_get_string (&args->values[0]);
 
@@ -571,7 +583,7 @@
       GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
 
       if (brush)
-        aspect_ratio = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
+        spikes = GIMP_BRUSH_GENERATED (brush)->spikes;
       else
         success = FALSE;
     }
@@ -579,32 +591,38 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], aspect_ratio);
+    g_value_set_int (&return_vals->values[1], spikes);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_get_angle_invoker (GimpProcedure      *procedure,
-                         Gimp               *gimp,
-                         GimpContext        *context,
-                         GimpProgress       *progress,
-                         const GValueArray  *args,
-                         GError            **error)
+brush_set_spikes_invoker (GimpProcedure      *procedure,
+                          Gimp               *gimp,
+                          GimpContext        *context,
+                          GimpProgress       *progress,
+                          const GValueArray  *args,
+                          GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble angle = 0.0;
+  gint32 spikes_in;
+  gint32 spikes_out = 0;
 
   name = g_value_get_string (&args->values[0]);
+  spikes_in = g_value_get_int (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
 
       if (brush)
-        angle = GIMP_BRUSH_GENERATED (brush)->angle;
+        {
+          gimp_brush_generated_set_spikes (GIMP_BRUSH_GENERATED (brush),
+                                           spikes_in);
+          spikes_out = GIMP_BRUSH_GENERATED (brush)->spikes;
+        }
       else
         success = FALSE;
     }
@@ -612,38 +630,32 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], angle);
+    g_value_set_int (&return_vals->values[1], spikes_out);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_set_shape_invoker (GimpProcedure      *procedure,
-                         Gimp               *gimp,
-                         GimpContext        *context,
-                         GimpProgress       *progress,
-                         const GValueArray  *args,
-                         GError            **error)
+brush_get_hardness_invoker (GimpProcedure      *procedure,
+                            Gimp               *gimp,
+                            GimpContext        *context,
+                            GimpProgress       *progress,
+                            const GValueArray  *args,
+                            GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gint32 shape_in;
-  gint32 shape_out = 0;
+  gdouble hardness = 0.0;
 
   name = g_value_get_string (&args->values[0]);
-  shape_in = g_value_get_enum (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
 
       if (brush)
-        {
-          gimp_brush_generated_set_shape (GIMP_BRUSH_GENERATED (brush),
-                                          shape_in);
-          shape_out = GIMP_BRUSH_GENERATED (brush)->shape;
-        }
+        hardness = GIMP_BRUSH_GENERATED (brush)->hardness;
       else
         success = FALSE;
     }
@@ -651,27 +663,27 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_enum (&return_vals->values[1], shape_out);
+    g_value_set_double (&return_vals->values[1], hardness);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_set_radius_invoker (GimpProcedure      *procedure,
-                          Gimp               *gimp,
-                          GimpContext        *context,
-                          GimpProgress       *progress,
-                          const GValueArray  *args,
-                          GError            **error)
+brush_set_hardness_invoker (GimpProcedure      *procedure,
+                            Gimp               *gimp,
+                            GimpContext        *context,
+                            GimpProgress       *progress,
+                            const GValueArray  *args,
+                            GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble radius_in;
-  gdouble radius_out = 0.0;
+  gdouble hardness_in;
+  gdouble hardness_out = 0.0;
 
   name = g_value_get_string (&args->values[0]);
-  radius_in = g_value_get_double (&args->values[1]);
+  hardness_in = g_value_get_double (&args->values[1]);
 
   if (success)
     {
@@ -679,9 +691,9 @@
 
       if (brush)
         {
-          gimp_brush_generated_set_radius (GIMP_BRUSH_GENERATED (brush),
-                                           radius_in);
-          radius_out = GIMP_BRUSH_GENERATED (brush)->radius;
+          gimp_brush_generated_set_hardness (GIMP_BRUSH_GENERATED (brush),
+                                             hardness_in);
+          hardness_out = GIMP_BRUSH_GENERATED (brush)->hardness;
         }
       else
         success = FALSE;
@@ -690,38 +702,32 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], radius_out);
+    g_value_set_double (&return_vals->values[1], hardness_out);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_set_spikes_invoker (GimpProcedure      *procedure,
-                          Gimp               *gimp,
-                          GimpContext        *context,
-                          GimpProgress       *progress,
-                          const GValueArray  *args,
-                          GError            **error)
+brush_get_aspect_ratio_invoker (GimpProcedure      *procedure,
+                                Gimp               *gimp,
+                                GimpContext        *context,
+                                GimpProgress       *progress,
+                                const GValueArray  *args,
+                                GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gint32 spikes_in;
-  gint32 spikes_out = 0;
+  gdouble aspect_ratio = 0.0;
 
   name = g_value_get_string (&args->values[0]);
-  spikes_in = g_value_get_int (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
 
       if (brush)
-        {
-          gimp_brush_generated_set_spikes (GIMP_BRUSH_GENERATED (brush),
-                                           spikes_in);
-          spikes_out = GIMP_BRUSH_GENERATED (brush)->spikes;
-        }
+        aspect_ratio = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
       else
         success = FALSE;
     }
@@ -729,27 +735,27 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_int (&return_vals->values[1], spikes_out);
+    g_value_set_double (&return_vals->values[1], aspect_ratio);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_set_hardness_invoker (GimpProcedure      *procedure,
-                            Gimp               *gimp,
-                            GimpContext        *context,
-                            GimpProgress       *progress,
-                            const GValueArray  *args,
-                            GError            **error)
+brush_set_aspect_ratio_invoker (GimpProcedure      *procedure,
+                                Gimp               *gimp,
+                                GimpContext        *context,
+                                GimpProgress       *progress,
+                                const GValueArray  *args,
+                                GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble hardness_in;
-  gdouble hardness_out = 0.0;
+  gdouble aspect_ratio_in;
+  gdouble aspect_ratio_out = 0.0;
 
   name = g_value_get_string (&args->values[0]);
-  hardness_in = g_value_get_double (&args->values[1]);
+  aspect_ratio_in = g_value_get_double (&args->values[1]);
 
   if (success)
     {
@@ -757,9 +763,9 @@
 
       if (brush)
         {
-          gimp_brush_generated_set_hardness (GIMP_BRUSH_GENERATED (brush),
-                                             hardness_in);
-          hardness_out = GIMP_BRUSH_GENERATED (brush)->hardness;
+          gimp_brush_generated_set_aspect_ratio (GIMP_BRUSH_GENERATED (brush),
+                                                 aspect_ratio_in);
+          aspect_ratio_out = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
         }
       else
         success = FALSE;
@@ -768,38 +774,32 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], hardness_out);
+    g_value_set_double (&return_vals->values[1], aspect_ratio_out);
 
   return return_vals;
 }
 
 static GValueArray *
-brush_set_aspect_ratio_invoker (GimpProcedure      *procedure,
-                                Gimp               *gimp,
-                                GimpContext        *context,
-                                GimpProgress       *progress,
-                                const GValueArray  *args,
-                                GError            **error)
+brush_get_angle_invoker (GimpProcedure      *procedure,
+                         Gimp               *gimp,
+                         GimpContext        *context,
+                         GimpProgress       *progress,
+                         const GValueArray  *args,
+                         GError            **error)
 {
   gboolean success = TRUE;
   GValueArray *return_vals;
   const gchar *name;
-  gdouble aspect_ratio_in;
-  gdouble aspect_ratio_out = 0.0;
+  gdouble angle = 0.0;
 
   name = g_value_get_string (&args->values[0]);
-  aspect_ratio_in = g_value_get_double (&args->values[1]);
 
   if (success)
     {
-      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, TRUE, error);
+      GimpBrush *brush = gimp_pdb_get_generated_brush (gimp, name, FALSE, error);
 
       if (brush)
-        {
-          gimp_brush_generated_set_aspect_ratio (GIMP_BRUSH_GENERATED (brush),
-                                                 aspect_ratio_in);
-          aspect_ratio_out = GIMP_BRUSH_GENERATED (brush)->aspect_ratio;
-        }
+        angle = GIMP_BRUSH_GENERATED (brush)->angle;
       else
         success = FALSE;
     }
@@ -807,7 +807,7 @@
   return_vals = gimp_procedure_get_return_values (procedure, success);
 
   if (success)
-    g_value_set_double (&return_vals->values[1], aspect_ratio_out);
+    g_value_set_double (&return_vals->values[1], angle);
 
   return return_vals;
 }
@@ -1239,14 +1239,14 @@
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-get-radius
+   * gimp-brush-set-shape
    */
-  procedure = gimp_procedure_new (brush_get_radius_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-radius");
+  procedure = gimp_procedure_new (brush_set_shape_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-shape");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-get-radius",
-                                     "Get the radius of a generated brush.",
-                                     "This procedure gets the radius value for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-set-shape",
+                                     "Set the shape of a generated brush.",
+                                     "This procedure sets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1258,24 +1258,32 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_enum ("shape-in",
+                                                  "shape in",
+                                                  "The brush shape",
+                                                  GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                  GIMP_BRUSH_GENERATED_CIRCLE,
+                                                  GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("radius",
-                                                        "radius",
-                                                        "The radius of the brush in pixels",
-                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                        GIMP_PARAM_READWRITE));
+                                   g_param_spec_enum ("shape-out",
+                                                      "shape out",
+                                                      "The brush shape actually assigned",
+                                                      GIMP_TYPE_BRUSH_GENERATED_SHAPE,
+                                                      GIMP_BRUSH_GENERATED_CIRCLE,
+                                                      GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-get-spikes
+   * gimp-brush-get-radius
    */
-  procedure = gimp_procedure_new (brush_get_spikes_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-spikes");
+  procedure = gimp_procedure_new (brush_get_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-radius");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-get-spikes",
-                                     "Get the number of spikes for a generated brush.",
-                                     "This procedure gets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-get-radius",
+                                     "Get the radius of a generated brush.",
+                                     "This procedure gets the radius value for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1288,23 +1296,23 @@
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("spikes",
-                                                          "spikes",
-                                                          "The number of spikes on the brush.",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
+                                   g_param_spec_double ("radius",
+                                                        "radius",
+                                                        "The radius of the brush in pixels",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-get-hardness
+   * gimp-brush-set-radius
    */
-  procedure = gimp_procedure_new (brush_get_hardness_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-hardness");
+  procedure = gimp_procedure_new (brush_set_radius_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-radius");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-get-hardness",
-                                     "Get the hardness of a generated brush.",
-                                     "This procedure gets the hardness of a generated brush. The hardness of a brush is the amount its intensity fades at the outside edge. If called for any other type of brush, the function does not succeed.",
+                                     "gimp-brush-set-radius",
+                                     "Set the radius of a generated brush.",
+                                     "This procedure sets the radius for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1316,24 +1324,30 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               g_param_spec_double ("radius-in",
+                                                    "radius in",
+                                                    "The desired brush radius",
+                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                    GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("hardness",
-                                                        "hardness",
-                                                        "The hardness of the brush.",
+                                   g_param_spec_double ("radius-out",
+                                                        "radius out",
+                                                        "The brush radius actually assigned",
                                                         -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                         GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-get-aspect-ratio
+   * gimp-brush-get-spikes
    */
-  procedure = gimp_procedure_new (brush_get_aspect_ratio_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-aspect-ratio");
+  procedure = gimp_procedure_new (brush_get_spikes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-spikes");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-get-aspect-ratio",
-                                     "Get the aspect ratio of a generated brush.",
-                                     "This procedure gets the aspect ratio of a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-get-spikes",
+                                     "Get the number of spikes for a generated brush.",
+                                     "This procedure gets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1346,23 +1360,23 @@
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("aspect-ratio",
-                                                        "aspect ratio",
-                                                        "The aspect ratio of the brush.",
-                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                        GIMP_PARAM_READWRITE));
+                                   gimp_param_spec_int32 ("spikes",
+                                                          "spikes",
+                                                          "The number of spikes on the brush.",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-get-angle
+   * gimp-brush-set-spikes
    */
-  procedure = gimp_procedure_new (brush_get_angle_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-angle");
+  procedure = gimp_procedure_new (brush_set_spikes_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-spikes");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-get-angle",
-                                     "Get the rotation angle of a generated brush.",
-                                     "This procedure gets the angle of rotation for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-set-spikes",
+                                     "Set the number of spikes for a generated brush.",
+                                     "This procedure sets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1374,24 +1388,30 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
+  gimp_procedure_add_argument (procedure,
+                               gimp_param_spec_int32 ("spikes-in",
+                                                      "spikes in",
+                                                      "The desired number of spikes",
+                                                      G_MININT32, G_MAXINT32, 0,
+                                                      GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("angle",
-                                                        "angle",
-                                                        "The rotation angle of the brush.",
-                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                        GIMP_PARAM_READWRITE));
+                                   gimp_param_spec_int32 ("spikes-out",
+                                                          "spikes out",
+                                                          "The number of spikes actually assigned",
+                                                          G_MININT32, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-set-shape
+   * gimp-brush-get-hardness
    */
-  procedure = gimp_procedure_new (brush_set_shape_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-shape");
+  procedure = gimp_procedure_new (brush_get_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-hardness");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-set-shape",
-                                     "Set the shape of a generated brush.",
-                                     "This procedure sets the shape value for a generated brush. If called for any other type of brush, it does not succeed. The current possibilities are Circle (GIMP_BRUSH_GENERATED_CIRCLE), Square (GIMP_BRUSH_GENERATED_SQUARE), and Diamond (GIMP_BRUSH_GENERATED_DIAMOND). Other shapes are likely to be added in the future.",
+                                     "gimp-brush-get-hardness",
+                                     "Get the hardness of a generated brush.",
+                                     "This procedure gets the hardness of a generated brush. The hardness of a brush is the amount its intensity fades at the outside edge. If called for any other type of brush, the function does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1403,32 +1423,24 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_enum ("shape-in",
-                                                  "shape in",
-                                                  "The brush shape",
-                                                  GIMP_TYPE_BRUSH_GENERATED_SHAPE,
-                                                  GIMP_BRUSH_GENERATED_CIRCLE,
-                                                  GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_enum ("shape-out",
-                                                      "shape out",
-                                                      "The brush shape actually assigned",
-                                                      GIMP_TYPE_BRUSH_GENERATED_SHAPE,
-                                                      GIMP_BRUSH_GENERATED_CIRCLE,
-                                                      GIMP_PARAM_READWRITE));
+                                   g_param_spec_double ("hardness",
+                                                        "hardness",
+                                                        "The hardness of the brush.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-set-radius
+   * gimp-brush-set-hardness
    */
-  procedure = gimp_procedure_new (brush_set_radius_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-radius");
+  procedure = gimp_procedure_new (brush_set_hardness_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-hardness");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-set-radius",
-                                     "Set the radius of a generated brush.",
-                                     "This procedure sets the radius for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-set-hardness",
+                                     "Set the hardness of a generated brush.",
+                                     "This procedure sets the hardness for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1441,29 +1453,29 @@
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
   gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("radius-in",
-                                                    "radius in",
-                                                    "The desired brush radius",
+                               g_param_spec_double ("hardness-in",
+                                                    "hardness in",
+                                                    "The desired brush hardness",
                                                     -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                     GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("radius-out",
-                                                        "radius out",
-                                                        "The brush radius actually assigned",
+                                   g_param_spec_double ("hardness-out",
+                                                        "hardness out",
+                                                        "The brush hardness actually assigned",
                                                         -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                         GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-set-spikes
+   * gimp-brush-get-aspect-ratio
    */
-  procedure = gimp_procedure_new (brush_set_spikes_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-spikes");
+  procedure = gimp_procedure_new (brush_get_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-aspect-ratio");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-set-spikes",
-                                     "Set the number of spikes for a generated brush.",
-                                     "This procedure sets the number of spikes for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-get-aspect-ratio",
+                                     "Get the aspect ratio of a generated brush.",
+                                     "This procedure gets the aspect ratio of a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1475,30 +1487,24 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_int32 ("spikes-in",
-                                                      "spikes in",
-                                                      "The desired number of spikes",
-                                                      G_MININT32, G_MAXINT32, 0,
-                                                      GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("spikes-out",
-                                                          "spikes out",
-                                                          "The number of spikes actually assigned",
-                                                          G_MININT32, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
+                                   g_param_spec_double ("aspect-ratio",
+                                                        "aspect ratio",
+                                                        "The aspect ratio of the brush.",
+                                                        -G_MAXDOUBLE, G_MAXDOUBLE, 0,
+                                                        GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-set-hardness
+   * gimp-brush-set-aspect-ratio
    */
-  procedure = gimp_procedure_new (brush_set_hardness_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-hardness");
+  procedure = gimp_procedure_new (brush_set_aspect_ratio_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-aspect-ratio");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-set-hardness",
-                                     "Set the hardness of a generated brush.",
-                                     "This procedure sets the hardness for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-set-aspect-ratio",
+                                     "Set the aspect ratio of a generated brush.",
+                                     "This procedure sets the aspect ratio for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1511,29 +1517,29 @@
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
   gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("hardness-in",
-                                                    "hardness in",
-                                                    "The desired brush hardness",
+                               g_param_spec_double ("aspect-ratio-in",
+                                                    "aspect ratio in",
+                                                    "The desired brush aspect ratio",
                                                     -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                     GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("hardness-out",
-                                                        "hardness out",
-                                                        "The brush hardness actually assigned",
+                                   g_param_spec_double ("aspect-ratio-out",
+                                                        "aspect ratio out",
+                                                        "The brush aspect ratio actually assigned",
                                                         -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                         GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
 
   /*
-   * gimp-brush-set-aspect-ratio
+   * gimp-brush-get-angle
    */
-  procedure = gimp_procedure_new (brush_set_aspect_ratio_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-set-aspect-ratio");
+  procedure = gimp_procedure_new (brush_get_angle_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-brush-get-angle");
   gimp_procedure_set_static_strings (procedure,
-                                     "gimp-brush-set-aspect-ratio",
-                                     "Set the aspect ratio of a generated brush.",
-                                     "This procedure sets the aspect ratio for a generated brush. If called for any other type of brush, it does not succeed.",
+                                     "gimp-brush-get-angle",
+                                     "Get the rotation angle of a generated brush.",
+                                     "This procedure gets the angle of rotation for a generated brush. If called for any other type of brush, it does not succeed.",
                                      "Bill Skaggs <weskaggs primate ucdavis edu>",
                                      "Bill Skaggs",
                                      "2004",
@@ -1545,16 +1551,10 @@
                                                        FALSE, FALSE, TRUE,
                                                        NULL,
                                                        GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               g_param_spec_double ("aspect-ratio-in",
-                                                    "aspect ratio in",
-                                                    "The desired brush aspect ratio",
-                                                    -G_MAXDOUBLE, G_MAXDOUBLE, 0,
-                                                    GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
-                                   g_param_spec_double ("aspect-ratio-out",
-                                                        "aspect ratio out",
-                                                        "The brush aspect ratio actually assigned",
+                                   g_param_spec_double ("angle",
+                                                        "angle",
+                                                        "The rotation angle of the brush.",
                                                         -G_MAXDOUBLE, G_MAXDOUBLE, 0,
                                                         GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);

Modified: trunk/app/pdb/brush_select_cmds.c
==============================================================================
--- trunk/app/pdb/brush_select_cmds.c	(original)
+++ trunk/app/pdb/brush_select_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,17 +20,16 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/brushes_cmds.c
==============================================================================
--- trunk/app/pdb/brushes_cmds.c	(original)
+++ trunk/app/pdb/brushes_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,9 +25,6 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
 #include "core/gimp.h"
@@ -35,8 +32,11 @@
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/buffer_cmds.c
==============================================================================
--- trunk/app/pdb/buffer_cmds.c	(original)
+++ trunk/app/pdb/buffer_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,16 +25,16 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpbuffer.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontainer.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/channel_cmds.c
==============================================================================
--- trunk/app/pdb/channel_cmds.c	(original)
+++ trunk/app/pdb/channel_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,24 +20,24 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpchannel-combine.h"
 #include "core/gimpchannel.h"
 #include "core/gimpimage.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 channel_new_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/color_cmds.c
==============================================================================
--- trunk/app/pdb/color_cmds.c	(original)
+++ trunk/app/pdb/color_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,9 +25,6 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/gimphistogram.h"
 #include "core/gimpdrawable-brightness-contrast.h"
@@ -43,11 +40,15 @@
 #include "core/gimpdrawable-posterize.h"
 #include "core/gimpdrawable-threshold.h"
 #include "core/gimpdrawable.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 brightness_contrast_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/context_cmds.c
==============================================================================
--- trunk/app/pdb/context_cmds.c	(original)
+++ trunk/app/pdb/context_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,25 +20,24 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontainer.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin-context.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 
@@ -81,6 +80,29 @@
 }
 
 static GValueArray *
+context_list_paint_methods_invoker (GimpProcedure      *procedure,
+                                    Gimp               *gimp,
+                                    GimpContext        *context,
+                                    GimpProgress       *progress,
+                                    const GValueArray  *args,
+                                    GError            **error)
+{
+  GValueArray *return_vals;
+  gint32 num_paint_methods = 0;
+  gchar **paint_methods = NULL;
+
+  paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
+                                                 &num_paint_methods);
+
+  return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+
+  g_value_set_int (&return_vals->values[1], num_paint_methods);
+  gimp_value_take_stringarray (&return_vals->values[2], paint_methods, num_paint_methods);
+
+  return return_vals;
+}
+
+static GValueArray *
 context_get_paint_method_invoker (GimpProcedure      *procedure,
                                   Gimp               *gimp,
                                   GimpContext        *context,
@@ -134,29 +156,6 @@
 }
 
 static GValueArray *
-context_list_paint_methods_invoker (GimpProcedure      *procedure,
-                                    Gimp               *gimp,
-                                    GimpContext        *context,
-                                    GimpProgress       *progress,
-                                    const GValueArray  *args,
-                                    GError            **error)
-{
-  GValueArray *return_vals;
-  gint32 num_paint_methods = 0;
-  gchar **paint_methods = NULL;
-
-  paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
-                                                 &num_paint_methods);
-
-  return_vals = gimp_procedure_get_return_values (procedure, TRUE);
-
-  g_value_set_int (&return_vals->values[1], num_paint_methods);
-  gimp_value_take_stringarray (&return_vals->values[2], paint_methods, num_paint_methods);
-
-  return return_vals;
-}
-
-static GValueArray *
 context_get_foreground_invoker (GimpProcedure      *procedure,
                                 Gimp               *gimp,
                                 GimpContext        *context,
@@ -647,6 +646,33 @@
   g_object_unref (procedure);
 
   /*
+   * gimp-context-list-paint-methods
+   */
+  procedure = gimp_procedure_new (context_list_paint_methods_invoker);
+  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-context-list-paint-methods");
+  gimp_procedure_set_static_strings (procedure,
+                                     "gimp-context-list-paint-methods",
+                                     "Lists the available paint methods.",
+                                     "This procedure lists the names of the available paint methods. Any of the results can be used for 'gimp-context-set-paint-method'.",
+                                     "Simon Budig",
+                                     "Simon Budig",
+                                     "2007",
+                                     NULL);
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_int32 ("num-paint-methods",
+                                                          "num paint methods",
+                                                          "The number of the available paint methods",
+                                                          0, G_MAXINT32, 0,
+                                                          GIMP_PARAM_READWRITE));
+  gimp_procedure_add_return_value (procedure,
+                                   gimp_param_spec_string_array ("paint-methods",
+                                                                 "paint methods",
+                                                                 "The names of the available paint methods",
+                                                                 GIMP_PARAM_READWRITE));
+  gimp_pdb_register_procedure (pdb, procedure);
+  g_object_unref (procedure);
+
+  /*
    * gimp-context-get-paint-method
    */
   procedure = gimp_procedure_new (context_get_paint_method_invoker);
@@ -693,33 +719,6 @@
   g_object_unref (procedure);
 
   /*
-   * gimp-context-list-paint-methods
-   */
-  procedure = gimp_procedure_new (context_list_paint_methods_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-context-list-paint-methods");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-context-list-paint-methods",
-                                     "Lists the available paint methods.",
-                                     "This procedure lists the names of the available paint methods. Any of the results can be used for 'gimp-context-set-paint-method'.",
-                                     "Simon Budig",
-                                     "Simon Budig",
-                                     "2007",
-                                     NULL);
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("num-paint-methods",
-                                                          "num paint methods",
-                                                          "The number of the available paint methods",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string_array ("paint-methods",
-                                                                 "paint methods",
-                                                                 "The names of the available paint methods",
-                                                                 GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
    * gimp-context-get-foreground
    */
   procedure = gimp_procedure_new (context_get_foreground_invoker);

Modified: trunk/app/pdb/convert_cmds.c
==============================================================================
--- trunk/app/pdb/convert_cmds.c	(original)
+++ trunk/app/pdb/convert_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,17 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
-#include "core/gimp.h"
 #include "core/gimpimage-convert.h"
 #include "core/gimpimage.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/display_cmds.c
==============================================================================
--- trunk/app/pdb/display_cmds.c	(original)
+++ trunk/app/pdb/display_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,18 +20,17 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontainer.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/drawable_cmds.c
==============================================================================
--- trunk/app/pdb/drawable_cmds.c	(original)
+++ trunk/app/pdb/drawable_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,13 +20,9 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
 #include "base/tile-manager.h"
@@ -40,13 +36,17 @@
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
 #include "core/gimplayermask.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 drawable_is_valid_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/drawable_transform_cmds.c
==============================================================================
--- trunk/app/pdb/drawable_transform_cmds.c	(original)
+++ trunk/app/pdb/drawable_transform_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,15 +20,11 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "config/gimpcoreconfig.h"
 #include "core/gimp-transform-utils.h"
@@ -36,12 +32,16 @@
 #include "core/gimpdrawable-transform.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimpprogress.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 drawable_transform_flip_simple_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/edit_cmds.c
==============================================================================
--- trunk/app/pdb/edit_cmds.c	(original)
+++ trunk/app/pdb/edit_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,9 +25,6 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp-edit.h"
 #include "core/gimp.h"
@@ -37,14 +34,18 @@
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimpprogress.h"
 #include "core/gimpstrokedesc.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
 #include "vectors/gimpvectors.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 edit_cut_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/fileops_cmds.c
==============================================================================
--- trunk/app/pdb/fileops_cmds.c	(original)
+++ trunk/app/pdb/fileops_cmds.c	Thu Feb  7 17:08:54 2008
@@ -28,14 +28,12 @@
 #include "libgimpconfig/gimpconfig.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp-utils.h"
 #include "core/gimp.h"
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
 #include "file/file-open.h"
 #include "file/file-procedure.h"
 #include "file/file-save.h"
@@ -43,6 +41,8 @@
 #include "plug-in/gimppluginmanager-file.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/floating_sel_cmds.c
==============================================================================
--- trunk/app/pdb/floating_sel_cmds.c	(original)
+++ trunk/app/pdb/floating_sel_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,23 +20,23 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimplayer-floating-sel.h"
 #include "core/gimplayer.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 #include "gimppdberror.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 floating_sel_remove_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/font_select_cmds.c
==============================================================================
--- trunk/app/pdb/font_select_cmds.c	(original)
+++ trunk/app/pdb/font_select_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,16 +20,15 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/fonts_cmds.c
==============================================================================
--- trunk/app/pdb/fonts_cmds.c	(original)
+++ trunk/app/pdb/fonts_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,18 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontainer.h"
+#include "core/gimpparamspecs.h"
 #include "text/gimp-fonts.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/gimprc_cmds.c
==============================================================================
--- trunk/app/pdb/gimprc_cmds.c	(original)
+++ trunk/app/pdb/gimprc_cmds.c	Thu Feb  7 17:08:54 2008
@@ -29,15 +29,15 @@
 #include "libgimpmodule/gimpmodule.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "config/gimprc.h"
 #include "core/gimp-utils.h"
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimptemplate.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/gradient_cmds.c
==============================================================================
--- trunk/app/pdb/gradient_cmds.c	(original)
+++ trunk/app/pdb/gradient_cmds.c	Thu Feb  7 17:08:54 2008
@@ -27,16 +27,16 @@
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpgradient.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/gradient_select_cmds.c
==============================================================================
--- trunk/app/pdb/gradient_select_cmds.c	(original)
+++ trunk/app/pdb/gradient_select_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,18 +20,17 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpgradient.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/gradients_cmds.c
==============================================================================
--- trunk/app/pdb/gradients_cmds.c	(original)
+++ trunk/app/pdb/gradients_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,17 +25,17 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimpgradient.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/grid_cmds.c
==============================================================================
--- trunk/app/pdb/grid_cmds.c	(original)
+++ trunk/app/pdb/grid_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,21 +20,20 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbaseenums.h"
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpgrid.h"
 #include "core/gimpimage-grid.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/guides_cmds.c
==============================================================================
--- trunk/app/pdb/guides_cmds.c	(original)
+++ trunk/app/pdb/guides_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,18 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpguide.h"
 #include "core/gimpimage-guides.h"
 #include "core/gimpimage-undo-push.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/help_cmds.c
==============================================================================
--- trunk/app/pdb/help_cmds.c	(original)
+++ trunk/app/pdb/help_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,18 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager-help-domain.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.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	Thu Feb  7 17:08:54 2008
@@ -20,7 +20,6 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
@@ -28,9 +27,6 @@
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
 #include "config/gimpcoreconfig.h"
@@ -50,15 +46,19 @@
 #include "core/gimplayer.h"
 #include "core/gimplayermask.h"
 #include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimppickable.h"
 #include "core/gimpselection.h"
 #include "core/gimpunit.h"
-#include "gimp-intl.h"
 #include "gimppdberror.h"
 #include "vectors/gimpvectors.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 #if defined (HAVE_FINITE)
 #define FINITE(x) finite(x)

Modified: trunk/app/pdb/layer_cmds.c
==============================================================================
--- trunk/app/pdb/layer_cmds.c	(original)
+++ trunk/app/pdb/layer_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,15 +20,11 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "config/gimpcoreconfig.h"
 #include "core/gimp.h"
@@ -38,11 +34,15 @@
 #include "core/gimpitem-linked.h"
 #include "core/gimplayer.h"
 #include "core/gimplayermask.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 layer_new_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/message_cmds.c
==============================================================================
--- trunk/app/pdb/message_cmds.c	(original)
+++ trunk/app/pdb/message_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,17 +25,18 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 message_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/misc_cmds.c
==============================================================================
--- trunk/app/pdb/misc_cmds.c	(original)
+++ trunk/app/pdb/misc_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,18 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/base-utils.h"
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/paint_tools_cmds.c
==============================================================================
--- trunk/app/pdb/paint_tools_cmds.c	(original)
+++ trunk/app/pdb/paint_tools_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,24 +20,22 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
-#include "core/gimp.h"
 #include "core/gimpdrawable.h"
 #include "core/gimppaintinfo.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 #include "paint/gimppaintcore-stroke.h"
 #include "paint/gimppaintcore.h"
 #include "paint/gimppaintoptions.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/palette_cmds.c
==============================================================================
--- trunk/app/pdb/palette_cmds.c	(original)
+++ trunk/app/pdb/palette_cmds.c	Thu Feb  7 17:08:54 2008
@@ -27,16 +27,16 @@
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimppalette.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/palette_select_cmds.c
==============================================================================
--- trunk/app/pdb/palette_select_cmds.c	(original)
+++ trunk/app/pdb/palette_select_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,17 +20,16 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/palettes_cmds.c
==============================================================================
--- trunk/app/pdb/palettes_cmds.c	(original)
+++ trunk/app/pdb/palettes_cmds.c	Thu Feb  7 17:08:54 2008
@@ -27,17 +27,17 @@
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
 #include "core/gimppalette.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/parasite_cmds.c
==============================================================================
--- trunk/app/pdb/parasite_cmds.c	(original)
+++ trunk/app/pdb/parasite_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,21 +20,20 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp-parasites.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 #include "vectors/gimpvectors.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/paths_cmds.c
==============================================================================
--- trunk/app/pdb/paths_cmds.c	(original)
+++ trunk/app/pdb/paths_cmds.c	Thu Feb  7 17:08:54 2008
@@ -27,24 +27,24 @@
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
-#include "core/gimp.h"
 #include "core/gimpchannel-select.h"
 #include "core/gimpimage.h"
 #include "core/gimplist.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimpstrokedesc.h"
-#include "gimp-intl.h"
 #include "vectors/gimpanchor.h"
 #include "vectors/gimpbezierstroke.h"
 #include "vectors/gimpvectors-compat.h"
 #include "vectors/gimpvectors-import.h"
 #include "vectors/gimpvectors.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 path_list_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/pattern_cmds.c
==============================================================================
--- trunk/app/pdb/pattern_cmds.c	(original)
+++ trunk/app/pdb/pattern_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,17 +25,16 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
-#include "core/gimp.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimppattern.h"
-#include "gimppdb-utils.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/pattern_select_cmds.c
==============================================================================
--- trunk/app/pdb/pattern_select_cmds.c	(original)
+++ trunk/app/pdb/pattern_select_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,17 +20,16 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/patterns_cmds.c
==============================================================================
--- trunk/app/pdb/patterns_cmds.c	(original)
+++ trunk/app/pdb/patterns_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,18 +25,18 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "base/temp-buf.h"
 #include "core/gimp.h"
 #include "core/gimpcontainer-filter.h"
 #include "core/gimpcontext.h"
 #include "core/gimpdatafactory.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimppattern.h"
-#include "gimppdb-utils.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/plug_in_cmds.c
==============================================================================
--- trunk/app/pdb/plug_in_cmds.c	(original)
+++ trunk/app/pdb/plug_in_cmds.c	Thu Feb  7 17:08:54 2008
@@ -28,11 +28,9 @@
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimpplugindef.h"
 #include "plug-in/gimppluginmanager-menu-branch.h"
@@ -40,6 +38,8 @@
 #include "plug-in/gimppluginmanager.h"
 #include "plug-in/gimppluginprocedure.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/procedural_db_cmds.c
==============================================================================
--- trunk/app/pdb/procedural_db_cmds.c	(original)
+++ trunk/app/pdb/procedural_db_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,22 +20,21 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpparamspecs-desc.h"
+#include "core/gimpparamspecs.h"
 #include "gimp-pdb-compat.h"
 #include "gimppdb-query.h"
 #include "plug-in/gimppluginmanager-data.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/progress_cmds.c
==============================================================================
--- trunk/app/pdb/progress_cmds.c	(original)
+++ trunk/app/pdb/progress_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,19 +20,18 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin-progress.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/selection_cmds.c
==============================================================================
--- trunk/app/pdb/selection_cmds.c	(original)
+++ trunk/app/pdb/selection_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,26 +20,26 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpchannel-select.h"
 #include "core/gimpchannel.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimppickable.h"
 #include "core/gimpselection.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 selection_bounds_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/selection_tools_cmds.c
==============================================================================
--- trunk/app/pdb/selection_tools_cmds.c	(original)
+++ trunk/app/pdb/selection_tools_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,24 +20,24 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpchannel-select.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 by_color_select_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/text_tool_cmds.c
==============================================================================
--- trunk/app/pdb/text_tool_cmds.c	(original)
+++ trunk/app/pdb/text_tool_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,22 +20,21 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimplayer.h"
-#include "gimppdb-utils.h"
+#include "core/gimpparamspecs.h"
 #include "text/gimptext-compat.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/transform_tools_cmds.c
==============================================================================
--- trunk/app/pdb/transform_tools_cmds.c	(original)
+++ trunk/app/pdb/transform_tools_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,15 +20,11 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpmath/gimpmath.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "config/gimpcoreconfig.h"
 #include "core/gimp-transform-utils.h"
@@ -36,12 +32,16 @@
 #include "core/gimpdrawable-transform.h"
 #include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 #include "core/gimpprogress.h"
-#include "gimp-intl.h"
-#include "gimppdb-utils.h"
 
+#include "gimppdb.h"
+#include "gimppdb-utils.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 flip_invoker (GimpProcedure      *procedure,

Modified: trunk/app/pdb/undo_cmds.c
==============================================================================
--- trunk/app/pdb/undo_cmds.c	(original)
+++ trunk/app/pdb/undo_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,21 +20,20 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
 #include "core/gimp.h"
 #include "core/gimpimage-undo.h"
 #include "core/gimpimage.h"
+#include "core/gimpparamspecs.h"
 #include "plug-in/gimpplugin-cleanup.h"
 #include "plug-in/gimpplugin.h"
 #include "plug-in/gimppluginmanager.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/unit_cmds.c
==============================================================================
--- trunk/app/pdb/unit_cmds.c	(original)
+++ trunk/app/pdb/unit_cmds.c	Thu Feb  7 17:08:54 2008
@@ -20,18 +20,17 @@
 
 #include "config.h"
 
-
 #include <glib-object.h>
 
 #include "libgimpbase/gimpbase.h"
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
+#include "core/gimpparamspecs.h"
 #include "core/gimpunit.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
 

Modified: trunk/app/pdb/vectors_cmds.c
==============================================================================
--- trunk/app/pdb/vectors_cmds.c	(original)
+++ trunk/app/pdb/vectors_cmds.c	Thu Feb  7 17:08:54 2008
@@ -25,15 +25,11 @@
 #include <glib-object.h>
 
 #include "pdb-types.h"
-#include "gimppdb.h"
-#include "gimpprocedure.h"
-#include "core/gimpparamspecs.h"
 
-#include "core/gimp.h"
 #include "core/gimpchannel-select.h"
 #include "core/gimpimage.h"
 #include "core/gimplist.h"
-#include "gimp-intl.h"
+#include "core/gimpparamspecs.h"
 #include "vectors/gimpanchor.h"
 #include "vectors/gimpbezierstroke.h"
 #include "vectors/gimpstroke-new.h"
@@ -41,8 +37,12 @@
 #include "vectors/gimpvectors-import.h"
 #include "vectors/gimpvectors.h"
 
+#include "gimppdb.h"
+#include "gimpprocedure.h"
 #include "internal_procs.h"
 
+#include "gimp-intl.h"
+
 
 static GValueArray *
 vectors_is_valid_invoker (GimpProcedure      *procedure,

Modified: trunk/tools/pdbgen/app.pl
==============================================================================
--- trunk/tools/pdbgen/app.pl	(original)
+++ trunk/tools/pdbgen/app.pl	Thu Feb  7 17:08:54 2008
@@ -669,6 +669,8 @@
 
 	foreach (@{$main::grp{$group}->{headers}}) { $out->{headers}->{$_}++ }
 
+	$out->{headers}->{"\"core/gimpparamspecs.h\""}++;
+
 	my @headers = sort {
 	    my ($x, $y) = ($a, $b);
 	    foreach ($x, $y) {
@@ -681,16 +683,22 @@
 	    }
 	    $x cmp $y;
 	} keys %{$out->{headers}};
-        my $headers = "";
-        my $lib = 0; my $seen = 0; my $sys = 0; my $base = 0;
+
+	my $headers = "";
+	my $lib = 0;
+	my $seen = 0;
+	my $sys = 0;
+	my $base = 0;
+	my $intl = 0;
+	my $utils = 0;
+
 	foreach (@headers) {
 	    $seen++ if /^</;
 
 	    if ($sys == 0 && !/^</) {
 		$sys = 1;
-		$headers .= "\n";
-		$headers .= '#include <glib-object.h>';
-		$headers .= "\n\n";
+		$headers .= "\n" if $seen;
+		$headers .= "#include <glib-object.h>\n\n";
 	    }
 
 	    $seen = 0 if !/^</;
@@ -704,22 +712,28 @@
 
 		if ($sys == 1 && $base == 0) {
 		    $base = 1;
-
-		    $headers .= '#include "pdb-types.h"';
-		    $headers .= "\n";
-		    $headers .= '#include "gimppdb.h"';
-		    $headers .= "\n";
-		    $headers .= '#include "gimpprocedure.h"';
-		    $headers .= "\n";
-		    $headers .= '#include "core/gimpparamspecs.h"';
-		    $headers .= "\n\n";
+		    $headers .= "#include \"pdb-types.h\"\n\n";
 		}
 	    }
 
-	    $headers .= "#include $_\n";
+	    if (/gimp-intl/) {
+		$intl = 1;
+	    }
+	    elsif (/gimppdb-utils/) {
+		$utils = 1;
+	    }
+	    else {
+		$headers .= "#include $_\n";
+	    }
 	}
 
-	$headers .= "\n#include \"internal_procs.h\"\n";
+	$headers .= "\n";
+	$headers .= "#include \"gimppdb.h\"\n";
+	$headers .= "#include \"gimppdb-utils.h\"\n" if $utils;
+	$headers .= "#include \"gimpprocedure.h\"\n";
+	$headers .= "#include \"internal_procs.h\"\n";
+
+	$headers .= "\n#include \"gimp-intl.h\"\n" if $intl;
 
 	my $extra = {};
 	if (exists $main::grp{$group}->{extra}->{app}) {

Modified: trunk/tools/pdbgen/pdb/brush.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/brush.pdb	(original)
+++ trunk/tools/pdbgen/pdb/brush.pdb	Thu Feb  7 17:08:54 2008
@@ -845,16 +845,21 @@
               "core/gimpdatafactory.h"
               "gimppdb-utils.h");
 
- procs = qw(brush_new brush_duplicate brush_is_generated 
-            brush_rename brush_delete brush_is_editable
-            brush_get_info brush_get_pixels
+ procs = qw(brush_new
+            brush_duplicate
+            brush_is_generated 
+            brush_rename
+            brush_delete
+            brush_is_editable
+            brush_get_info
+            brush_get_pixels
             brush_get_spacing brush_set_spacing
-            brush_get_shape brush_get_radius
-            brush_get_spikes brush_get_hardness
-            brush_get_aspect_ratio brush_get_angle
-            brush_set_shape brush_set_radius
-            brush_set_spikes brush_set_hardness
-            brush_set_aspect_ratio brush_set_angle);
+            brush_get_shape brush_set_shape
+            brush_get_radius brush_set_radius
+            brush_get_spikes brush_set_spikes
+            brush_get_hardness brush_set_hardness
+            brush_get_aspect_ratio brush_set_aspect_ratio
+            brush_get_angle brush_set_angle);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/brush_select.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/brush_select.pdb	(original)
+++ trunk/tools/pdbgen/pdb/brush_select.pdb	Thu Feb  7 17:08:54 2008
@@ -120,9 +120,12 @@
 }
 
 
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+              "core/gimpdatafactory.h");
 
- procs = qw(brushes_popup brushes_close_popup brushes_set_popup);
+ procs = qw(brushes_popup
+            brushes_close_popup
+            brushes_set_popup);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/brushes.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/brushes.pdb	(original)
+++ trunk/tools/pdbgen/pdb/brushes.pdb	Thu Feb  7 17:08:54 2008
@@ -206,7 +206,8 @@
               "core/gimpdatafactory.h"
               "gimppdb-utils.h");
 
- procs = qw(brushes_refresh brushes_get_list
+ procs = qw(brushes_refresh
+            brushes_get_list
             brushes_get_brush
             brushes_get_spacing brushes_set_spacing
             brushes_get_brush_data);

Modified: trunk/tools/pdbgen/pdb/buffer.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/buffer.pdb	(original)
+++ trunk/tools/pdbgen/pdb/buffer.pdb	Thu Feb  7 17:08:54 2008
@@ -239,9 +239,12 @@
 	      "gimppdb-utils.h");
 
 @procs = qw(buffers_get_list
-            buffer_rename buffer_delete
-	    buffer_get_width buffer_get_height
-            buffer_get_bytes buffer_get_image_type);
+            buffer_rename
+            buffer_delete
+	    buffer_get_width
+            buffer_get_height
+            buffer_get_bytes
+            buffer_get_image_type);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/channel.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/channel.pdb	(original)
+++ trunk/tools/pdbgen/pdb/channel.pdb	Thu Feb  7 17:08:54 2008
@@ -344,7 +344,9 @@
 
 @headers = qw("libgimpbase/gimpbase.h");
 
- procs = qw(channel_new channel_new_from_component channel_copy
+ procs = qw(channel_new
+            channel_new_from_component
+            channel_copy
             channel_combine_masks
             channel_get_show_masked channel_set_show_masked
             channel_get_opacity channel_set_opacity

Modified: trunk/tools/pdbgen/pdb/context.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/context.pdb	(original)
+++ trunk/tools/pdbgen/pdb/context.pdb	Thu Feb  7 17:08:54 2008
@@ -717,11 +717,12 @@
               "gimppdb-utils.h");
 
 @procs = qw(context_push context_pop
-            context_get_paint_method context_set_paint_method
             context_list_paint_methods
+            context_get_paint_method context_set_paint_method
             context_get_foreground context_set_foreground
             context_get_background context_set_background
-            context_set_default_colors context_swap_colors
+            context_set_default_colors
+            context_swap_colors
             context_get_opacity context_set_opacity
             context_get_paint_mode context_set_paint_mode
             context_get_brush context_set_brush

Modified: trunk/tools/pdbgen/pdb/convert.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/convert.pdb	(original)
+++ trunk/tools/pdbgen/pdb/convert.pdb	Thu Feb  7 17:08:54 2008
@@ -183,8 +183,7 @@
     );
 }
 
- headers = qw("core/gimp.h"
-              "core/gimpimage.h"
+ headers = qw("core/gimpimage.h"
               "core/gimpimage-convert.h"
               "gimppdb-utils.h");
 

Modified: trunk/tools/pdbgen/pdb/display.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/display.pdb	(original)
+++ trunk/tools/pdbgen/pdb/display.pdb	Thu Feb  7 17:08:54 2008
@@ -210,9 +210,12 @@
 
 @headers = qw("core/gimp.h");
 
- procs = qw(display_is_valid display_new display_delete
+ procs = qw(display_is_valid
+            display_new
+            display_delete
             display_get_window_handle
-	    displays_flush displays_reconnect);
+	    displays_flush
+            displays_reconnect);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/drawable.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/drawable.pdb	(original)
+++ trunk/tools/pdbgen/pdb/drawable.pdb	Thu Feb  7 17:08:54 2008
@@ -1279,18 +1279,25 @@
             drawable_is_layer drawable_is_layer_mask drawable_is_channel
 	    drawable_type  drawable_type_with_alpha drawable_has_alpha
             drawable_is_rgb drawable_is_gray drawable_is_indexed
-            drawable_bpp drawable_width drawable_height drawable_offsets
+            drawable_bpp
+            drawable_width
+            drawable_height
+            drawable_offsets
             drawable_delete
             drawable_get_image drawable_set_image
             drawable_get_name drawable_set_name
             drawable_get_visible drawable_set_visible
             drawable_get_linked drawable_set_linked
             drawable_get_tattoo drawable_set_tattoo
-            drawable_mask_bounds drawable_mask_intersect
-            drawable_merge_shadow drawable_update
+            drawable_mask_bounds
+            drawable_mask_intersect
+            drawable_merge_shadow
+            drawable_update
             drawable_get_pixel drawable_set_pixel
-	    drawable_fill drawable_offset
-            drawable_thumbnail drawable_sub_thumbnail
+	    drawable_fill
+            drawable_offset
+            drawable_thumbnail
+            drawable_sub_thumbnail
             drawable_foreground_extract);
 
 %exports = (app => [ procs], lib => [ procs]);

Modified: trunk/tools/pdbgen/pdb/drawable_transform.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/drawable_transform.pdb	(original)
+++ trunk/tools/pdbgen/pdb/drawable_transform.pdb	Thu Feb  7 17:08:54 2008
@@ -1037,15 +1037,21 @@
               "gimp-intl.h");
 
 @procs = qw(drawable_transform_flip_simple
-            drawable_transform_flip drawable_transform_flip_default
+            drawable_transform_flip
+            drawable_transform_flip_default
             drawable_transform_perspective
             drawable_transform_perspective_default
             drawable_transform_rotate_simple
-            drawable_transform_rotate drawable_transform_rotate_default
-            drawable_transform_scale drawable_transform_scale_default
-            drawable_transform_shear drawable_transform_shear_default
-            drawable_transform_2d drawable_transform_2d_default
-            drawable_transform_matrix drawable_transform_matrix_default);
+            drawable_transform_rotate
+            drawable_transform_rotate_default
+            drawable_transform_scale
+            drawable_transform_scale_default
+            drawable_transform_shear
+            drawable_transform_shear_default
+            drawable_transform_2d
+            drawable_transform_2d_default
+            drawable_transform_matrix
+            drawable_transform_matrix_default);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/edit.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/edit.pdb	(original)
+++ trunk/tools/pdbgen/pdb/edit.pdb	Thu Feb  7 17:08:54 2008
@@ -896,12 +896,19 @@
               "gimppdb-utils.h"
               "gimp-intl.h");
 
- procs = qw(edit_cut edit_copy edit_copy_visible
+ procs = qw(edit_cut
+            edit_copy edit_copy_visible
             edit_paste edit_paste_as_new
-            edit_named_cut edit_named_copy edit_named_copy_visible
+            edit_named_cut
+            edit_named_copy edit_named_copy_visible
             edit_named_paste edit_named_paste_as_new
-            edit_clear edit_fill edit_bucket_fill edit_bucket_fill_full
-	    edit_blend edit_stroke edit_stroke_vectors);
+            edit_clear
+            edit_fill
+            edit_bucket_fill
+            edit_bucket_fill_full
+	    edit_blend
+            edit_stroke
+            edit_stroke_vectors);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/fileops.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/fileops.pdb	(original)
+++ trunk/tools/pdbgen/pdb/fileops.pdb	Thu Feb  7 17:08:54 2008
@@ -615,11 +615,15 @@
 	      "file/file-procedure.h"
               "file/file-utils.h");
 
- procs = qw(file_load file_load_layer file_load_layers
+ procs = qw(file_load
+            file_load_layer
+            file_load_layers
             file_save
-            file_load_thumbnail file_save_thumbnail
+            file_load_thumbnail
+            file_save_thumbnail
             temp_name
-            register_magic_load_handler register_load_handler
+            register_magic_load_handler
+            register_load_handler
             register_save_handler
             register_file_handler_mime
             register_thumbnail_loader);

Modified: trunk/tools/pdbgen/pdb/font_select.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/font_select.pdb	(original)
+++ trunk/tools/pdbgen/pdb/font_select.pdb	Thu Feb  7 17:08:54 2008
@@ -98,7 +98,9 @@
 
 @headers = qw("core/gimp.h");
 
- procs = qw(fonts_popup fonts_close_popup fonts_set_popup);
+ procs = qw(fonts_popup
+            fonts_close_popup
+            fonts_set_popup);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/fonts.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/fonts.pdb	(original)
+++ trunk/tools/pdbgen/pdb/fonts.pdb	Thu Feb  7 17:08:54 2008
@@ -69,9 +69,12 @@
 }
 
 
- headers = qw("core/gimp.h" "core/gimpcontainer.h" "text/gimp-fonts.h");
+ headers = qw("core/gimp.h"
+              "core/gimpcontainer.h"
+              "text/gimp-fonts.h");
 
- procs = qw(fonts_refresh fonts_get_list);
+ procs = qw(fonts_refresh
+            fonts_get_list);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/gimprc.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/gimprc.pdb	(original)
+++ trunk/tools/pdbgen/pdb/gimprc.pdb	Thu Feb  7 17:08:54 2008
@@ -239,9 +239,14 @@
               "config/gimprc.h"
               "core/gimp.h");
 
- procs = qw(gimprc_query gimprc_set 
-	    get_default_comment get_default_unit get_monitor_resolution
-	    get_theme_dir get_color_configuration get_module_load_inhibit);
+ procs = qw(gimprc_query
+            gimprc_set 
+	    get_default_comment
+            get_default_unit
+            get_monitor_resolution
+	    get_theme_dir
+            get_color_configuration
+            get_module_load_inhibit);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/gradient.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/gradient.pdb	(original)
+++ trunk/tools/pdbgen/pdb/gradient.pdb	Thu Feb  7 17:08:54 2008
@@ -1382,8 +1382,11 @@
               "core/gimpdatafactory.h"
               "gimppdb-utils.h");
 
- procs = qw(gradient_new gradient_duplicate  gradient_is_editable
-	    gradient_rename gradient_delete
+ procs = qw(gradient_new
+            gradient_duplicate
+            gradient_is_editable
+	    gradient_rename
+            gradient_delete
             gradient_get_uniform_samples gradient_get_custom_samples
             gradient_segment_get_left_color gradient_segment_set_left_color
             gradient_segment_get_right_color gradient_segment_set_right_color

Modified: trunk/tools/pdbgen/pdb/gradient_select.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/gradient_select.pdb	(original)
+++ trunk/tools/pdbgen/pdb/gradient_select.pdb	Thu Feb  7 17:08:54 2008
@@ -106,9 +106,13 @@
 }
 
 
- headers = qw("core/gimp.h" "core/gimpdatafactory.h" "core/gimpgradient.h");
-
- procs = qw(gradients_popup gradients_close_popup gradients_set_popup);
+ headers = qw("core/gimp.h"
+              "core/gimpdatafactory.h"
+              "core/gimpgradient.h");
+
+ procs = qw(gradients_popup
+            gradients_close_popup
+            gradients_set_popup);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/gradients.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/gradients.pdb	(original)
+++ trunk/tools/pdbgen/pdb/gradients.pdb	Thu Feb  7 17:08:54 2008
@@ -253,8 +253,10 @@
               "core/gimpgradient.h"
               "gimppdb-utils.h");
 
- procs = qw(gradients_refresh gradients_get_list
-	    gradients_sample_uniform gradients_sample_custom
+ procs = qw(gradients_refresh
+            gradients_get_list
+	    gradients_sample_uniform
+            gradients_sample_custom
             gradients_get_gradient_data);
 
 %exports = (app => [ procs], lib => [ procs]);

Modified: trunk/tools/pdbgen/pdb/image.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/image.pdb	(original)
+++ trunk/tools/pdbgen/pdb/image.pdb	Thu Feb  7 17:08:54 2008
@@ -2559,14 +2559,18 @@
             image_base_type
             image_width image_height
             image_free_shadow
-            image_resize image_resize_to_layers image_scale
+            image_resize image_resize_to_layers
+            image_scale
             image_crop image_flip image_rotate
-            image_get_layers image_get_channels
+            image_get_layers
+            image_get_channels
             image_get_vectors
             image_get_active_drawable
             image_unset_active_channel
-            image_get_floating_sel image_floating_sel_attached_to
-            image_pick_color image_pick_correlate_layer
+            image_get_floating_sel
+            image_floating_sel_attached_to
+            image_pick_color
+            image_pick_correlate_layer
             image_add_layer image_remove_layer
 	    image_get_layer_position
             image_raise_layer image_lower_layer

Modified: trunk/tools/pdbgen/pdb/layer.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/layer.pdb	(original)
+++ trunk/tools/pdbgen/pdb/layer.pdb	Thu Feb  7 17:08:54 2008
@@ -956,11 +956,18 @@
               "gimppdb-utils.h"
               "gimp-intl.h");
 
- procs = qw(layer_new layer_new_from_drawable layer_copy
-            layer_add_alpha layer_flatten
-            layer_scale layer_resize layer_resize_to_image_size
-	    layer_translate layer_set_offsets
-            layer_create_mask layer_get_mask layer_from_mask
+ procs = qw(layer_new
+            layer_new_from_drawable
+            layer_copy
+            layer_add_alpha
+            layer_flatten
+            layer_scale
+            layer_resize layer_resize_to_image_size
+	    layer_translate
+            layer_set_offsets
+            layer_create_mask
+            layer_get_mask
+            layer_from_mask
             layer_add_mask layer_remove_mask
 	    layer_is_floating_sel
             layer_get_lock_alpha layer_set_lock_alpha

Modified: trunk/tools/pdbgen/pdb/message.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/message.pdb	(original)
+++ trunk/tools/pdbgen/pdb/message.pdb	Thu Feb  7 17:08:54 2008
@@ -103,7 +103,9 @@
               "plug-in/gimppluginmanager.h"
               "gimp-intl.h");
 
- procs = qw(message message_get_handler message_set_handler);
+ procs = qw(message
+            message_get_handler
+            message_set_handler);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/misc.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/misc.pdb	(original)
+++ trunk/tools/pdbgen/pdb/misc.pdb	Thu Feb  7 17:08:54 2008
@@ -82,8 +82,7 @@
     );
 
     %invoke = (
-	headers => [ qw("core/gimp.h") ],
-	code    => <<'CODE'
+	code => <<'CODE'
 {
   gimp_exit (gimp, force);
 }
@@ -92,7 +91,11 @@
 }
 
 
- procs = qw(version getpid quit);
+ headers = qw("core/gimp.h");
+
+ procs = qw(version
+            getpid
+            quit);
 
 %exports = (app => [ procs], lib => [ procs[0  1]]);
 

Modified: trunk/tools/pdbgen/pdb/paint_tools.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/paint_tools.pdb	(original)
+++ trunk/tools/pdbgen/pdb/paint_tools.pdb	Thu Feb  7 17:08:54 2008
@@ -942,7 +942,6 @@
 
 
 @headers = qw("libgimpmath/gimpmath.h"
-              "core/gimp.h"
               "core/gimppaintinfo.h"
               "paint/gimppaintcore.h"
               "paint/gimppaintcore-stroke.h"

Modified: trunk/tools/pdbgen/pdb/palette.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/palette.pdb	(original)
+++ trunk/tools/pdbgen/pdb/palette.pdb	Thu Feb  7 17:08:54 2008
@@ -546,8 +546,12 @@
               "core/gimppalette.h"
               "gimppdb-utils.h");
 
- procs = qw(palette_new palette_duplicate palette_rename palette_delete
-            palette_is_editable palette_get_info
+ procs = qw(palette_new
+            palette_duplicate
+            palette_rename
+            palette_delete
+            palette_is_editable
+            palette_get_info
             palette_get_columns palette_set_columns
             palette_add_entry palette_delete_entry
             palette_entry_get_color palette_entry_set_color

Modified: trunk/tools/pdbgen/pdb/palette_select.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/palette_select.pdb	(original)
+++ trunk/tools/pdbgen/pdb/palette_select.pdb	Thu Feb  7 17:08:54 2008
@@ -100,9 +100,12 @@
 }
 
 
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+              "core/gimpdatafactory.h");
 
- procs = qw(palettes_popup palettes_close_popup palettes_set_popup);
+ procs = qw(palettes_popup
+            palettes_close_popup
+            palettes_set_popup);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/palettes.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/palettes.pdb	(original)
+++ trunk/tools/pdbgen/pdb/palettes.pdb	Thu Feb  7 17:08:54 2008
@@ -153,8 +153,10 @@
               "core/gimppalette.h"
               "gimppdb-utils.h");
 
- procs = qw(palettes_refresh  palettes_get_list
-            palettes_get_palette palettes_get_palette_entry);
+ procs = qw(palettes_refresh
+            palettes_get_list
+            palettes_get_palette
+            palettes_get_palette_entry);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/paths.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/paths.pdb	(original)
+++ trunk/tools/pdbgen/pdb/paths.pdb	Thu Feb  7 17:08:54 2008
@@ -596,7 +596,6 @@
 
 @headers = qw(<string.h>
               "libgimpmath/gimpmath.h"
-              "core/gimp.h"
               "core/gimplist.h"
               "core/gimpchannel-select.h"
               "vectors/gimpanchor.h"

Modified: trunk/tools/pdbgen/pdb/pattern.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/pattern.pdb	(original)
+++ trunk/tools/pdbgen/pdb/pattern.pdb	Thu Feb  7 17:08:54 2008
@@ -114,13 +114,13 @@
 
 @headers = qw(<string.h>
               "base/temp-buf.h"
-              "core/gimp.h"
               "core/gimpcontext.h"
               "core/gimpdatafactory.h"
               "core/gimppattern.h"
               "gimppdb-utils.h");
 
- procs = qw(pattern_get_info pattern_get_pixels);
+ procs = qw(pattern_get_info
+            pattern_get_pixels);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/pattern_select.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/pattern_select.pdb	(original)
+++ trunk/tools/pdbgen/pdb/pattern_select.pdb	Thu Feb  7 17:08:54 2008
@@ -100,9 +100,12 @@
 }
 
 
- headers = qw("core/gimp.h" "core/gimpdatafactory.h");
+ headers = qw("core/gimp.h"
+              "core/gimpdatafactory.h");
 
- procs = qw(patterns_popup patterns_close_popup patterns_set_popup);
+ procs = qw(patterns_popup
+            patterns_close_popup
+            patterns_set_popup);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/patterns.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/patterns.pdb	(original)
+++ trunk/tools/pdbgen/pdb/patterns.pdb	Thu Feb  7 17:08:54 2008
@@ -158,7 +158,9 @@
               "core/gimppattern.h"
               "gimppdb-utils.h");
 
- procs = qw(patterns_refresh patterns_get_list patterns_get_pattern
+ procs = qw(patterns_refresh
+            patterns_get_list
+            patterns_get_pattern
             patterns_get_pattern_data);
 
 %exports = (app => [ procs], lib => [ procs]);

Modified: trunk/tools/pdbgen/pdb/plug_in.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/plug_in.pdb	(original)
+++ trunk/tools/pdbgen/pdb/plug_in.pdb	Thu Feb  7 17:08:54 2008
@@ -283,8 +283,10 @@
               "plug-in/gimppluginprocedure.h");
 
 @procs = qw(plugins_query
-	    plugin_domain_register plugin_help_register
-            plugin_menu_register plugin_menu_branch_register
+	    plugin_domain_register
+            plugin_help_register
+            plugin_menu_register
+            plugin_menu_branch_register
             plugin_icon_register);
 
 %exports = (app => [ procs], lib => [ procs[1,2,3,4,5]]);

Modified: trunk/tools/pdbgen/pdb/procedural_db.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/procedural_db.pdb	(original)
+++ trunk/tools/pdbgen/pdb/procedural_db.pdb	Thu Feb  7 17:08:54 2008
@@ -447,13 +447,15 @@
 @headers = qw("libgimpbase/gimpbase.h"
               "core/gimp.h"
               "core/gimpparamspecs-desc.h"
+              "plug-in/gimppluginmanager-data.h"
               "gimppdb-query.h"
-              "gimp-pdb-compat.h"
-              "plug-in/gimppluginmanager-data.h");
+              "gimp-pdb-compat.h");
 
- procs = qw(procedural_db_temp_name procedural_db_dump
-            procedural_db_query procedural_db_proc_info
-	    procedural_db_proc_arg procedural_db_proc_val
+ procs = qw(procedural_db_temp_name
+            procedural_db_dump
+            procedural_db_query
+            procedural_db_proc_info
+            procedural_db_proc_arg procedural_db_proc_val
 	    procedural_db_get_data procedural_db_get_data_size
 	    procedural_db_set_data);
 

Modified: trunk/tools/pdbgen/pdb/progress.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/progress.pdb	(original)
+++ trunk/tools/pdbgen/pdb/progress.pdb	Thu Feb  7 17:08:54 2008
@@ -302,9 +302,15 @@
               "plug-in/gimpplugin-progress.h"
               "plug-in/gimppluginmanager.h");
 
- procs = qw(progress_init progress_update progress_pulse progress_set_text
-            progress_end progress_get_window_handle
-            progress_install progress_uninstall progress_cancel);
+ procs = qw(progress_init
+            progress_update
+            progress_pulse
+            progress_set_text
+            progress_end
+            progress_get_window_handle
+            progress_install
+            progress_uninstall
+            progress_cancel);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/transform_tools.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/transform_tools.pdb	(original)
+++ trunk/tools/pdbgen/pdb/transform_tools.pdb	Thu Feb  7 17:08:54 2008
@@ -421,7 +421,12 @@
               "gimppdb-utils.h"
               "gimp-intl.h");
 
- procs = qw(flip perspective rotate scale shear transform_2d);
+ procs = qw(flip
+            perspective
+            rotate
+            scale
+            shear
+            transform_2d);
 
 %exports = (app => [ procs], lib => [ procs]);
 

Modified: trunk/tools/pdbgen/pdb/vectors.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/vectors.pdb	(original)
+++ trunk/tools/pdbgen/pdb/vectors.pdb	Thu Feb  7 17:08:54 2008
@@ -1345,8 +1345,11 @@
 }
 
 
- headers = qw(<string.h> "core/gimp.h" "core/gimplist.h" "core/gimpimage.h"
-              "core/gimpchannel-select.h" "vectors/gimpanchor.h"
+ headers = qw(<string.h>
+              "core/gimplist.h"
+              "core/gimpimage.h"
+              "core/gimpchannel-select.h"
+              "vectors/gimpanchor.h"
               "vectors/gimpstroke-new.h"
               "vectors/gimpbezierstroke.h"
               "vectors/gimpvectors.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]