procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 09:23:24 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

extensions, libgimp, plug-ins: remove n_drawables arg from GimpImageProcedure's…

Browse source 
… run() function.

This is more consistent with recent changes in PDB, and now the
drawables argument is NULL-terminated.
This commit is contained in:
Jehan 2024-10-28 12:16:13 +01:00
parent ea5824ebd7
commit 8900967a81
74 changed files with 63 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

4
extensions/goat-exercises/goat-exercise-c.c
View file

@ -64,7 +64,6 @@ static GimpProcedure * goat_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * goat_run (GimpProcedure *procedure, static GimpValueArray * goat_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -133,7 +132,6 @@ static GimpValueArray *
goat_run (GimpProcedure *procedure, goat_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -142,7 +140,7 @@ goat_run (GimpProcedure *procedure,
GimpPDBStatusType status = GIMP_PDB_SUCCESS; GimpPDBStatusType status = GIMP_PDB_SUCCESS;
gint x, y, width, height; gint x, y, width, height;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
extensions/goat-exercises/goat-exercise-py3.py
View file

@ -54,8 +54,8 @@ class Goat (Gimp.PlugIn):
return procedure return procedure
def run(self, procedure, run_mode, image, n_drawables, drawables, config, run_data): def run(self, procedure, run_mode, image, drawables, config, run_data):
if n_drawables != 1: if len(drawables) != 1:
msg = _("Procedure '{}' only works with one drawable.").format(procedure.get_name()) msg = _("Procedure '{}' only works with one drawable.").format(procedure.get_name())
error = GLib.Error.new_literal(Gimp.PlugIn.error_quark(), msg, 0) error = GLib.Error.new_literal(Gimp.PlugIn.error_quark(), msg, 0)
return procedure.new_return_values(Gimp.PDBStatusType.CALLING_ERROR, error) return procedure.new_return_values(Gimp.PDBStatusType.CALLING_ERROR, error)

5
libgimp/gimpimageprocedure.c
View file

@ -151,14 +151,12 @@ gimp_image_procedure_run (GimpProcedure *procedure,
GimpRunMode run_mode; GimpRunMode run_mode;
GimpImage *image; GimpImage *image;
GimpDrawable **drawables; GimpDrawable **drawables;
gint n_drawables;
gint i; gint i;
run_mode = GIMP_VALUES_GET_ENUM (args, 0); run_mode = GIMP_VALUES_GET_ENUM (args, 0);
image = GIMP_VALUES_GET_IMAGE (args, 1); image = GIMP_VALUES_GET_IMAGE (args, 1);
drawables = GIMP_VALUES_GET_CORE_OBJECT_ARRAY (args, 2); drawables = GIMP_VALUES_GET_CORE_OBJECT_ARRAY (args, 2);
n_drawables = gimp_core_object_array_get_length ((GObject **) drawables);
remaining = gimp_value_array_new (gimp_value_array_length (args) - ARG_OFFSET); remaining = gimp_value_array_new (gimp_value_array_length (args) - ARG_OFFSET);
for (i = ARG_OFFSET; i < gimp_value_array_length (args); i++) for (i = ARG_OFFSET; i < gimp_value_array_length (args); i++)
@ -171,8 +169,7 @@ gimp_image_procedure_run (GimpProcedure *procedure,
config = _gimp_procedure_create_run_config (procedure); config = _gimp_procedure_create_run_config (procedure);
_gimp_procedure_config_begin_run (config, image, run_mode, remaining, NULL); _gimp_procedure_config_begin_run (config, image, run_mode, remaining, NULL);
return_values = image_proc->run_func (procedure, run_mode, return_values = image_proc->run_func (procedure, run_mode, image, drawables,
image, n_drawables, drawables,
config, image_proc->run_data); config, image_proc->run_data);
if (return_values != NULL && if (return_values != NULL &&

4
libgimp/gimpimageprocedure.h
View file

@ -34,8 +34,7 @@ G_BEGIN_DECLS
* @procedure: the #GimpProcedure that runs. * @procedure: the #GimpProcedure that runs.
* @run_mode: the #GimpRunMode. * @run_mode: the #GimpRunMode.
* @image: the #GimpImage. * @image: the #GimpImage.
* @n_drawables: the number of #GimpDrawable-s. * @drawables: (array zero-terminated=1): the input #GimpDrawable-s.
* @drawables: (array length=n_drawables): the input #GimpDrawable-s.
* @config: the @procedure's remaining arguments. * @config: the @procedure's remaining arguments.
* @run_data: (closure): the run_data given in gimp_image_procedure_new(). * @run_data: (closure): the run_data given in gimp_image_procedure_new().
* *
@ -49,7 +48,6 @@ G_BEGIN_DECLS
typedef GimpValueArray * (* GimpRunImageFunc) (GimpProcedure *procedure, typedef GimpValueArray * (* GimpRunImageFunc) (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);

1
libgimp/tests/c-test-header.c
View file

@ -70,7 +70,6 @@ static GimpProcedure * gimp_c_test_create_procedure (GimpPlugIn *plug
static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);

1
libgimp/tests/test-color-parser.c
View file

@ -93,7 +93,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

1
libgimp/tests/test-export-options.c
View file

@ -8,7 +8,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

1
libgimp/tests/test-image.c
View file

@ -8,7 +8,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

1
libgimp/tests/test-palette.c
View file

@ -11,7 +11,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

1
libgimp/tests/test-selection-float.c
View file

@ -3,7 +3,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

1
libgimp/tests/test-unit.c
View file

@ -29,7 +29,6 @@ static GimpValueArray *
gimp_c_test_run (GimpProcedure *procedure, gimp_c_test_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/common/align-layers.c
View file

@ -96,7 +96,6 @@ static GimpProcedure * align_layers_create_procedure (GimpPlugIn
static GimpValueArray * align_layers_run (GimpProcedure *procedure, static GimpValueArray * align_layers_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -278,7 +277,6 @@ static GimpValueArray *
align_layers_run (GimpProcedure *procedure, align_layers_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/common/animation-optimize.c
View file

@ -86,7 +86,6 @@ static GimpProcedure * optimize_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * optimize_run (GimpProcedure *procedure, static GimpValueArray * optimize_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -307,7 +306,6 @@ static GimpValueArray *
optimize_run (GimpProcedure *procedure, optimize_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/common/animation-play.c
View file

@ -97,7 +97,6 @@ static GimpProcedure * play_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * play_run (GimpProcedure *procedure, static GimpValueArray * play_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -354,7 +353,6 @@ static GimpValueArray *
play_run (GimpProcedure *procedure, play_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *_image, GimpImage *_image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

4
plug-ins/common/blinds.c
View file

@ -73,7 +73,6 @@ static GimpProcedure * blinds_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * blinds_run (GimpProcedure *procedure, static GimpValueArray * blinds_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -185,7 +184,6 @@ static GimpValueArray *
blinds_run (GimpProcedure *procedure, blinds_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -194,7 +192,7 @@ blinds_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/border-average.c
View file

@ -57,7 +57,6 @@ static GimpProcedure * border_average_create_procedure (GimpPlugIn
static GimpValueArray * border_average_run (GimpProcedure *procedure, static GimpValueArray * border_average_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -179,7 +178,6 @@ static GimpValueArray *
border_average_run (GimpProcedure *procedure, border_average_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -192,7 +190,7 @@ border_average_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/checkerboard.c
View file

@ -57,7 +57,6 @@ static GimpProcedure * checkerboard_create_procedure (GimpPlugIn *plu
static GimpValueArray * checkerboard_run (GimpProcedure *procedure, static GimpValueArray * checkerboard_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -159,7 +158,6 @@ static GimpValueArray *
checkerboard_run (GimpProcedure *procedure, checkerboard_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -168,7 +166,7 @@ checkerboard_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/cml-explorer.c
View file

@ -336,7 +336,6 @@ static GimpProcedure * explorer_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * explorer_run (GimpProcedure *procedure, static GimpValueArray * explorer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -551,7 +550,6 @@ static GimpValueArray *
explorer_run (GimpProcedure *procedure, explorer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -559,7 +557,7 @@ explorer_run (GimpProcedure *procedure,
GBytes *settings_bytes = NULL; GBytes *settings_bytes = NULL;
GError *error = NULL; GError *error = NULL;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
g_set_error (&error, GIMP_PLUG_IN_ERROR, 0, g_set_error (&error, GIMP_PLUG_IN_ERROR, 0,
_("Procedure '%s' only works with one drawable."), _("Procedure '%s' only works with one drawable."),

2
plug-ins/common/colormap-remap.c
View file

@ -67,7 +67,6 @@ static GimpProcedure * remap_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * remap_run (GimpProcedure *procedure, static GimpValueArray * remap_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -248,7 +247,6 @@ static GimpValueArray *
remap_run (GimpProcedure *procedure, remap_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

4
plug-ins/common/compose.c
View file

@ -137,7 +137,6 @@ static GimpProcedure * compose_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * compose_run (GimpProcedure *procedure, static GimpValueArray * compose_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -558,7 +557,6 @@ static GimpValueArray *
compose_run (GimpProcedure *procedure, compose_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -576,7 +574,7 @@ compose_run (GimpProcedure *procedure,
if (compose_by_drawable) if (compose_by_drawable)
{ {
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/contrast-retinex.c
View file

@ -86,7 +86,6 @@ static GimpProcedure * retinex_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * retinex_run (GimpProcedure *procedure, static GimpValueArray * retinex_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -231,7 +230,6 @@ static GimpValueArray *
retinex_run (GimpProcedure *procedure, retinex_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -241,7 +239,7 @@ retinex_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/crop-zealous.c
View file

@ -55,7 +55,6 @@ static GimpProcedure * crop_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * crop_run (GimpProcedure *procedure, static GimpValueArray * crop_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -132,7 +131,6 @@ static GimpValueArray *
crop_run (GimpProcedure *procedure, crop_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -143,7 +141,7 @@ crop_run (GimpProcedure *procedure,
gimp_progress_init (_("Zealous cropping")); gimp_progress_init (_("Zealous cropping"));
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/curve-bend.c
View file

@ -237,7 +237,6 @@ static GimpProcedure * bender_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * bender_run (GimpProcedure *procedure, static GimpValueArray * bender_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -601,7 +600,6 @@ static GimpValueArray *
bender_run (GimpProcedure *procedure, bender_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -617,7 +615,7 @@ bender_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/decompose.c
View file

@ -98,7 +98,6 @@ static GimpProcedure * decompose_create_procedure (GimpPlugIn *plug_i
static GimpValueArray * decompose_run (GimpProcedure *procedure, static GimpValueArray * decompose_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -362,7 +361,6 @@ static GimpValueArray *
decompose_run (GimpProcedure *procedure, decompose_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -379,7 +377,7 @@ decompose_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/depth-merge.c
View file

@ -92,7 +92,6 @@ static GimpProcedure * merge_create_procedure (GimpPlugIn
static GimpValueArray * merge_run (GimpProcedure *procedure, static GimpValueArray * merge_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -275,7 +274,6 @@ static GimpValueArray *
merge_run (GimpProcedure *procedure, merge_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -285,7 +283,7 @@ merge_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/despeckle.c
View file

@ -92,7 +92,6 @@ static GimpProcedure * despeckle_create_procedure (GimpPlugIn *plug_i
static GimpValueArray * despeckle_run (GimpProcedure *procedure, static GimpValueArray * despeckle_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -218,7 +217,6 @@ static GimpValueArray *
despeckle_run (GimpProcedure *procedure, despeckle_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -227,7 +225,7 @@ despeckle_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/destripe.c
View file

@ -64,7 +64,6 @@ static GimpProcedure * destripe_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * destripe_run (GimpProcedure *procedure, static GimpValueArray * destripe_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -158,7 +157,6 @@ static GimpValueArray *
destripe_run (GimpProcedure *procedure, destripe_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -167,7 +165,7 @@ destripe_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

2
plug-ins/common/film.c
View file

@ -77,7 +77,6 @@ static GimpProcedure * film_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * film_run (GimpProcedure *procedure, static GimpValueArray * film_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -317,7 +316,6 @@ static GimpValueArray *
film_run (GimpProcedure *procedure, film_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

4
plug-ins/common/gradient-map.c
View file

@ -66,7 +66,6 @@ static GimpProcedure * map_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * map_run (GimpProcedure *procedure, static GimpValueArray * map_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -196,7 +195,6 @@ static GimpValueArray *
map_run (GimpProcedure *procedure, map_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -208,7 +206,7 @@ map_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/grid.c
View file

@ -86,7 +86,6 @@ static GimpProcedure * grid_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * grid_run (GimpProcedure *procedure, static GimpValueArray * grid_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -266,7 +265,6 @@ static GimpValueArray *
grid_run (GimpProcedure *procedure, grid_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -275,7 +273,7 @@ grid_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

2
plug-ins/common/guillotine.c
View file

@ -57,7 +57,6 @@ static GimpProcedure * guillotine_create_procedure (GimpPlugIn *plug_
static GimpValueArray * guillotine_run (GimpProcedure *procedure, static GimpValueArray * guillotine_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -139,7 +138,6 @@ static GimpValueArray *
guillotine_run (GimpProcedure *procedure, guillotine_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

4
plug-ins/common/hot.c
View file

@ -156,7 +156,6 @@ static GimpProcedure * hot_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * hot_run (GimpProcedure *procedure, static GimpValueArray * hot_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -299,7 +298,6 @@ static GimpValueArray *
hot_run (GimpProcedure *procedure, hot_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -308,7 +306,7 @@ hot_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/jigsaw.c
View file

@ -199,7 +199,6 @@ static GimpProcedure * jigsaw_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * jigsaw_run (GimpProcedure *procedure, static GimpValueArray * jigsaw_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -451,7 +450,6 @@ static GimpValueArray *
jigsaw_run (GimpProcedure *procedure, jigsaw_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -460,7 +458,7 @@ jigsaw_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

9
plug-ins/common/mail.c
View file

@ -78,14 +78,12 @@ static GimpProcedure * mail_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * mail_run (GimpProcedure *procedure, static GimpValueArray * mail_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
static GimpPDBStatusType send_image (GObject *config, static GimpPDBStatusType send_image (GObject *config,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
gint32 run_mode); gint32 run_mode);
@ -245,7 +243,6 @@ static GimpValueArray *
mail_run (GimpProcedure *procedure, mail_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -274,10 +271,7 @@ mail_run (GimpProcedure *procedure,
return gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL); return gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL);
} }
status = send_image (G_OBJECT (config), status = send_image (G_OBJECT (config), image, drawables, run_mode);
image,
n_drawables, drawables,
run_mode);
return gimp_procedure_new_return_values (procedure, status, NULL); return gimp_procedure_new_return_values (procedure, status, NULL);
} }
@ -285,7 +279,6 @@ mail_run (GimpProcedure *procedure,
static GimpPDBStatusType static GimpPDBStatusType
send_image (GObject *config, send_image (GObject *config,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
gint32 run_mode) gint32 run_mode)
{ {

4
plug-ins/common/nl-filter.c
View file

@ -84,7 +84,6 @@ static GimpProcedure * nlfilter_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * nlfilter_run (GimpProcedure *procedure, static GimpValueArray * nlfilter_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -200,7 +199,6 @@ static GimpValueArray *
nlfilter_run (GimpProcedure *procedure, nlfilter_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -209,7 +207,7 @@ nlfilter_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/qbist.c
View file

@ -110,7 +110,6 @@ static GimpProcedure * qbist_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * qbist_run (GimpProcedure *procedure, static GimpValueArray * qbist_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -229,7 +228,6 @@ static GimpValueArray *
qbist_run (GimpProcedure *procedure, qbist_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -248,7 +246,7 @@ qbist_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/sample-colorize.c
View file

@ -186,7 +186,6 @@ static GimpProcedure * colorize_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * colorize_run (GimpProcedure *procedure, static GimpValueArray * colorize_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -409,7 +408,6 @@ static GimpValueArray *
colorize_run (GimpProcedure *procedure, colorize_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -419,7 +417,7 @@ colorize_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/smooth-palette.c
View file

@ -60,7 +60,6 @@ static GimpProcedure * palette_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * palette_run (GimpProcedure *procedure, static GimpValueArray * palette_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -175,7 +174,6 @@ static GimpValueArray *
palette_run (GimpProcedure *procedure, palette_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -187,7 +185,7 @@ palette_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/sparkle.c
View file

@ -76,7 +76,6 @@ static GimpProcedure * sparkle_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * sparkle_run (GimpProcedure *procedure, static GimpValueArray * sparkle_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -285,7 +284,6 @@ static GimpValueArray *
sparkle_run (GimpProcedure *procedure, sparkle_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -295,7 +293,7 @@ sparkle_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/sphere-designer.c
View file

@ -283,7 +283,6 @@ static GimpProcedure * designer_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * designer_run (GimpProcedure *procedure, static GimpValueArray * designer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -3186,7 +3185,6 @@ static GimpValueArray *
designer_run (GimpProcedure *procedure, designer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -3197,7 +3195,7 @@ designer_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/tile-small.c
View file

@ -109,7 +109,6 @@ static GimpProcedure * tile_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * tile_run (GimpProcedure *procedure, static GimpValueArray * tile_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -295,7 +294,6 @@ static GimpValueArray *
tile_run (GimpProcedure *procedure, tile_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -306,7 +304,7 @@ tile_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/tile.c
View file

@ -59,7 +59,6 @@ static GimpProcedure * tile_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * tile_run (GimpProcedure *procedure, static GimpValueArray * tile_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -195,7 +194,6 @@ static GimpValueArray *
tile_run (GimpProcedure *procedure, tile_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -210,7 +208,7 @@ tile_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/van-gogh-lic.c
View file

@ -88,7 +88,6 @@ static GimpProcedure * lic_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * lic_run (GimpProcedure *procedure, static GimpValueArray * lic_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -227,7 +226,6 @@ static GimpValueArray *
lic_run (GimpProcedure *procedure, lic_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -236,7 +234,7 @@ lic_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/warp.c
View file

@ -114,7 +114,6 @@ static GimpProcedure * warp_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * warp_run (GimpProcedure *procedure, static GimpValueArray * warp_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -328,7 +327,6 @@ static GimpValueArray *
warp_run (GimpProcedure *procedure, warp_run (GimpProcedure *procedure,
GimpRunMode _run_mode, GimpRunMode _run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -338,7 +336,7 @@ warp_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/common/wavelet-decompose.c
View file

@ -58,7 +58,6 @@ static GimpProcedure * wavelet_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * wavelet_run (GimpProcedure *procedure, static GimpValueArray * wavelet_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -155,7 +154,6 @@ static GimpValueArray *
wavelet_run (GimpProcedure *procedure, wavelet_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -173,7 +171,7 @@ wavelet_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/flame/flame.c
View file

@ -88,7 +88,6 @@ static GimpProcedure * flame_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * flame_run (GimpProcedure *procedure, static GimpValueArray * flame_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *proc_config, GimpProcedureConfig *proc_config,
gpointer run_data); gpointer run_data);
@ -281,7 +280,6 @@ static GimpValueArray *
flame_run (GimpProcedure *procedure, flame_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *proc_config, GimpProcedureConfig *proc_config,
gpointer run_data) gpointer run_data)
@ -291,7 +289,7 @@ flame_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/fractal-explorer/fractal-explorer.c
View file

@ -96,7 +96,6 @@ static GimpProcedure * explorer_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * explorer_run (GimpProcedure *procedure, static GimpValueArray * explorer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -407,7 +406,6 @@ static GimpValueArray *
explorer_run (GimpProcedure *procedure, explorer_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -421,7 +419,7 @@ explorer_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/gfig/gfig.c
View file

@ -68,7 +68,6 @@ static GimpProcedure * gfig_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * gfig_run (GimpProcedure *procedure, static GimpValueArray * gfig_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -197,7 +196,6 @@ static GimpValueArray *
gfig_run (GimpProcedure *procedure, gfig_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -207,7 +205,7 @@ gfig_run (GimpProcedure *procedure,
gint pwidth, pheight; gint pwidth, pheight;
GimpGfig *gfig; GimpGfig *gfig;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/gimpressionist/gimp.c
View file

@ -62,7 +62,6 @@ static GimpProcedure * gimpressionist_create_procedure (GimpPlugIn *p
static GimpValueArray * gimpressionist_run (GimpProcedure *procedure, static GimpValueArray * gimpressionist_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -166,7 +165,6 @@ static GimpValueArray *
gimpressionist_run (GimpProcedure *procedure, gimpressionist_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -176,7 +174,7 @@ gimpressionist_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/gradient-flare/gradient-flare.c
View file

@ -378,7 +378,6 @@ static GimpProcedure * gflare_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * gflare_run (GimpProcedure *procedure, static GimpValueArray * gflare_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -906,7 +905,6 @@ static GimpValueArray *
gflare_run (GimpProcedure *procedure, gflare_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *_image, GimpImage *_image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -917,7 +915,7 @@ gflare_run (GimpProcedure *procedure,
image = _image; image = _image;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/ifs-compose/ifs-compose.c
View file

@ -206,7 +206,6 @@ static GimpProcedure * ifs_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * ifs_run (GimpProcedure *procedure, static GimpValueArray * ifs_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -465,7 +464,6 @@ static GimpValueArray *
ifs_run (GimpProcedure *procedure, ifs_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -485,7 +483,7 @@ ifs_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/imagemap/imap_main.c
View file

@ -74,7 +74,6 @@ static GimpProcedure * imap_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * imap_run (GimpProcedure *procedure, static GimpValueArray * imap_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -239,7 +238,6 @@ static GimpValueArray *
imap_run (GimpProcedure *procedure, imap_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -258,7 +256,7 @@ imap_run (GimpProcedure *procedure,
imap->builder = gtk_builder_new_from_resource ("/org/gimp/imagemap/imap-menu.ui"); imap->builder = gtk_builder_new_from_resource ("/org/gimp/imagemap/imap-menu.ui");
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

4
plug-ins/lighting/lighting-main.c
View file

@ -64,7 +64,6 @@ static GimpProcedure * lighting_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * lighting_run (GimpProcedure *procedure, static GimpValueArray * lighting_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -762,7 +761,6 @@ static GimpValueArray *
lighting_run (GimpProcedure *procedure, lighting_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -771,7 +769,7 @@ lighting_run (GimpProcedure *procedure,
gegl_init (NULL, NULL); gegl_init (NULL, NULL);
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

8
plug-ins/map-object/map-object-main.c
View file

@ -64,7 +64,6 @@ static GimpProcedure * map_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * map_run (GimpProcedure *procedure, static GimpValueArray * map_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -115,8 +114,8 @@ map_create_procedure (GimpPlugIn *plug_in,
default_color = gegl_color_new ("white"); default_color = gegl_color_new ("white");
procedure = gimp_image_procedure_new (plug_in, name, procedure = gimp_image_procedure_new (plug_in, name,
GIMP_PDB_PROC_TYPE_PLUGIN, GIMP_PDB_PROC_TYPE_PLUGIN,
map_run, NULL, NULL); map_run, NULL, NULL);
gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_image_types (procedure, "RGB*");
gimp_procedure_set_sensitivity_mask (procedure, gimp_procedure_set_sensitivity_mask (procedure,
@ -520,7 +519,6 @@ static GimpValueArray *
map_run (GimpProcedure *procedure, map_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *_image, GimpImage *_image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -531,7 +529,7 @@ map_run (GimpProcedure *procedure,
image = _image; image = _image;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

2
plug-ins/metadata/metadata-editor.c
View file

@ -74,7 +74,6 @@ static GimpProcedure * metadata_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * metadata_run (GimpProcedure *procedure, static GimpValueArray * metadata_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -783,7 +782,6 @@ static GimpValueArray *
metadata_run (GimpProcedure *procedure, metadata_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/metadata/metadata-viewer.c
View file

@ -95,7 +95,6 @@ static GimpProcedure * metadata_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * metadata_run (GimpProcedure *procedure, static GimpValueArray * metadata_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -203,7 +202,6 @@ static GimpValueArray *
metadata_run (GimpProcedure *procedure, metadata_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

4
plug-ins/pagecurl/pagecurl.c
View file

@ -118,7 +118,6 @@ static GimpProcedure * pagecurl_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * pagecurl_run (GimpProcedure *procedure, static GimpValueArray * pagecurl_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -279,7 +278,6 @@ static GimpValueArray *
pagecurl_run (GimpProcedure *procedure, pagecurl_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *_image, GimpImage *_image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)
@ -291,7 +289,7 @@ pagecurl_run (GimpProcedure *procedure,
image = _image; image = _image;
if (n_drawables != 1) if (gimp_core_object_array_get_length ((GObject **) drawables) != 1)
{ {
GError *error = NULL; GError *error = NULL;

2
plug-ins/print/print.c
View file

@ -70,7 +70,6 @@ static GimpProcedure * print_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * print_run (GimpProcedure *procedure, static GimpValueArray * print_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -213,7 +212,6 @@ static GimpValueArray *
print_run (GimpProcedure *procedure, print_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/python/foggify.py
View file

@ -30,7 +30,7 @@ import sys
def N_(message): return message def N_(message): return message
def _(message): return GLib.dgettext(None, message) def _(message): return GLib.dgettext(None, message)
def foggify(procedure, run_mode, image, n_drawables, drawables, config, data): def foggify(procedure, run_mode, image, drawables, config, data):
if run_mode == Gimp.RunMode.INTERACTIVE: if run_mode == Gimp.RunMode.INTERACTIVE:
GimpUi.init('python-fu-foggify') GimpUi.init('python-fu-foggify')

3
plug-ins/python/histogram-export.py
View file

@ -163,8 +163,7 @@ def histogram_export(procedure, img, layers, gio_file,
return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error()) return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error())
def run(procedure, run_mode, image, layers, config, data):
def run(procedure, run_mode, image, n_layers, layers, config, data):
if run_mode == Gimp.RunMode.INTERACTIVE: if run_mode == Gimp.RunMode.INTERACTIVE:
GimpUi.init("python-fu-histogram-export") GimpUi.init("python-fu-histogram-export")

2
plug-ins/python/spyro-plus.py
View file

@ -2309,7 +2309,7 @@ class SpyrogimpPlusPlugin(Gimp.PlugIn):
return procedure return procedure
# Implementation of plugin. # Implementation of plugin.
def plug_in_spyrogimp(self, procedure, run_mode, image, n_layers, layers, config, data): def plug_in_spyrogimp(self, procedure, run_mode, image, layers, config, data):
curve_type=config.get_property('curve-type') curve_type=config.get_property('curve-type')
shape=config.get_property('shape') shape=config.get_property('shape')
sides=config.get_property('sides') sides=config.get_property('sides')

2
plug-ins/python/test-dialog.py
View file

@ -94,7 +94,7 @@ def process_args(brush, font, gradient, palette, pattern):
return return
def test_dialog(procedure, run_mode, image, n_drawables, drawables, config, data): def test_dialog(procedure, run_mode, image, drawables, config, data):
''' '''
Just a standard shell for a plugin. Just a standard shell for a plugin.
''' '''

4
plug-ins/python/tests/test-file-plug-ins/test-file-plug-ins.py
View file

@ -99,7 +99,7 @@ class PythonTest (Gimp.PlugIn):
self.log = GimpLogger(True, self.test_cfg.log_file, LOG_APPEND, PRINT_VERBOSE, DEBUGGING) self.log = GimpLogger(True, self.test_cfg.log_file, LOG_APPEND, PRINT_VERBOSE, DEBUGGING)
def run_import_tests(self, procedure, _run_mode, _image, def run_import_tests(self, procedure, _run_mode, _image,
_n_drawables, _drawable, _config, _data): _drawable, _config, _data):
self.init_logging() self.init_logging()
if self.log.enabled: if self.log.enabled:
@ -109,7 +109,7 @@ class PythonTest (Gimp.PlugIn):
return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error()) return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error())
def run_export_tests(self, procedure, _run_mode, _image, def run_export_tests(self, procedure, _run_mode, _image,
_n_drawables, _drawable, _config, _data): _drawable, _config, _data):
self.init_logging() self.init_logging()
if self.log.enabled: if self.log.enabled:

2
plug-ins/script-fu/libscriptfu/script-fu-arg.c
View file

@ -786,7 +786,7 @@ script_fu_arg_reset_name_generator (void)
* Thus name meets uniquity for names of properties of one object. * Thus name meets uniquity for names of properties of one object.
* *
* !!! GimpImageProcedures already have properties for convenience arguments, * !!! GimpImageProcedures already have properties for convenience arguments,
* e.g. a property named "image" "n_drawables" and "drawables" * e.g. a property named "image" and "drawables"
* So we avoid that name clash by starting with "otherImage" * So we avoid that name clash by starting with "otherImage"
* *
* The name means nothing to human readers of the spec. * The name means nothing to human readers of the spec.

3
plug-ins/script-fu/libscriptfu/script-fu-command.c
View file

@ -147,14 +147,13 @@ GimpValueArray *
script_fu_interpret_image_proc (GimpProcedure *procedure, script_fu_interpret_image_proc (GimpProcedure *procedure,
SFScript *script, SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config) GimpProcedureConfig *config)
{ {
gchar *command; gchar *command;
GimpValueArray *result = NULL; GimpValueArray *result = NULL;
command = script_fu_script_get_command_for_image_proc (script, image, n_drawables, drawables, config); command = script_fu_script_get_command_for_image_proc (script, image, drawables, config);
result = sf_wrap_run_command (procedure, script, command); result = sf_wrap_run_command (procedure, script, command);
g_free (command); g_free (command);
return result; return result;

1
plug-ins/script-fu/libscriptfu/script-fu-command.h
View file

@ -24,7 +24,6 @@ gboolean script_fu_run_command (const gchar *command,
GimpValueArray *script_fu_interpret_image_proc (GimpProcedure *procedure, GimpValueArray *script_fu_interpret_image_proc (GimpProcedure *procedure,
SFScript *script, SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config); GimpProcedureConfig *config);
GimpValueArray *script_fu_interpret_regular_proc ( GimpValueArray *script_fu_interpret_regular_proc (

3
plug-ins/script-fu/libscriptfu/script-fu-dialog.c
View file

@ -233,7 +233,6 @@ script_fu_dialog_run_image_proc (
GimpProcedure *procedure, GimpProcedure *procedure,
SFScript *script, SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config) GimpProcedureConfig *config)
@ -249,7 +248,7 @@ script_fu_dialog_run_image_proc (
if (not_canceled) if (not_canceled)
result = script_fu_interpret_image_proc (procedure, script, result = script_fu_interpret_image_proc (procedure, script,
image, n_drawables, drawables, image, drawables,
config); config);
else else
result = gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL); result = gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL);

1
plug-ins/script-fu/libscriptfu/script-fu-dialog.h
View file

@ -25,7 +25,6 @@ GimpValueArray *script_fu_dialog_run_image_proc (
GimpProcedure *procedure, GimpProcedure *procedure,
SFScript *script, SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config); GimpProcedureConfig *config);
GimpValueArray *script_fu_dialog_run_regular_proc ( GimpValueArray *script_fu_dialog_run_regular_proc (

9
plug-ins/script-fu/libscriptfu/script-fu-run-func.c
View file

@ -65,7 +65,6 @@ GimpValueArray *
script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProcedure */ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProcedure */
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer data) gpointer data)
@ -99,12 +98,12 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc
if (n_specs > 1) if (n_specs > 1)
{ {
/* Let user choose "other" args in a dialog, then interpret. Maintain a config. */ /* Let user choose "other" args in a dialog, then interpret. Maintain a config. */
result = script_fu_dialog_run_image_proc (procedure, script, image, n_drawables, drawables, config); result = script_fu_dialog_run_image_proc (procedure, script, image, drawables, config);
} }
else else
{ {
/* No "other" args for user to choose. No config to maintain. */ /* No "other" args for user to choose. No config to maintain. */
result = script_fu_interpret_image_proc (procedure, script, image, n_drawables, drawables, config); result = script_fu_interpret_image_proc (procedure, script, image, drawables, config);
} }
break; break;
} }
@ -114,7 +113,7 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc
* Use the given config, without interacting with user. * Use the given config, without interacting with user.
* Since no user interaction, no config to maintain. * Since no user interaction, no config to maintain.
*/ */
result = script_fu_interpret_image_proc (procedure, script, image, n_drawables, drawables, config); result = script_fu_interpret_image_proc (procedure, script, image, drawables, config);
break; break;
} }
case GIMP_RUN_WITH_LAST_VALS: case GIMP_RUN_WITH_LAST_VALS:
@ -122,7 +121,7 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc
/* User invoked from a menu "Filter>Run with last values". /* User invoked from a menu "Filter>Run with last values".
* Do not show dialog. config are already last values. * Do not show dialog. config are already last values.
*/ */
result = script_fu_interpret_image_proc (procedure, script, image, n_drawables, drawables, config); result = script_fu_interpret_image_proc (procedure, script, image, drawables, config);
break; break;
} }
default: default:

1
plug-ins/script-fu/libscriptfu/script-fu-run-func.h
View file

@ -25,7 +25,6 @@ GimpValueArray *script_fu_run_procedure (GimpProcedure *procedure,
GimpValueArray *script_fu_run_image_procedure (GimpProcedure *procedure, GimpValueArray *script_fu_run_image_procedure (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer data); gpointer data);

17
plug-ins/script-fu/libscriptfu/script-fu-script.c
View file

@ -54,7 +54,6 @@ static void script_fu_script_set_drawable_sensitivity (
static void script_fu_command_append_drawables ( static void script_fu_command_append_drawables (
GString *s, GString *s,
guint n_drawables,
GimpDrawable **drawables); GimpDrawable **drawables);
/* /*
* Function definitions * Function definitions
@ -170,7 +169,7 @@ script_fu_script_create_PDB_procedure (GimpPlugIn *plug_in,
/* Script author does not declare image, drawable in script-fu-register-filter, /* Script author does not declare image, drawable in script-fu-register-filter,
* and we don't add to formal args in PDB. * and we don't add to formal args in PDB.
* The convenience class GimpImageProcedure already has formal args: * The convenience class GimpImageProcedure already has formal args:
* run_mode, image, n_drawables, drawables. * run_mode, image, drawables.
* "0" means not skip any arguments declared in the script. * "0" means not skip any arguments declared in the script.
*/ */
script_fu_script_set_proc_args (procedure, script, 0); script_fu_script_set_proc_args (procedure, script, 0);
@ -411,17 +410,16 @@ script_fu_script_get_command_from_params (SFScript *script,
*/ */
static void static void
script_fu_command_append_drawables (GString *s, script_fu_command_append_drawables (GString *s,
guint n_drawables,
GimpDrawable **drawables) GimpDrawable **drawables)
{ {
/* Require non-empty array of drawables. */ /* Require non-empty array of drawables. */
g_assert (n_drawables > 0); g_assert (drawables != NULL && drawables[0] != NULL);
/* !!! leading space to separate from prior args. /* !!! leading space to separate from prior args.
* #() is scheme syntax for a vector. * #() is scheme syntax for a vector.
*/ */
g_string_append (s, " #(" ); g_string_append (s, " #(" );
for (guint i=0; i < n_drawables; i++) for (guint i = 0; drawables[i] != NULL; i++)
{ {
g_string_append_printf (s, " %d", gimp_item_get_id ((GimpItem*) drawables[i])); g_string_append_printf (s, " %d", gimp_item_get_id ((GimpItem*) drawables[i]));
} }
@ -433,7 +431,6 @@ script_fu_command_append_drawables (GString *s,
gchar * gchar *
script_fu_script_get_command_for_image_proc (SFScript *script, script_fu_script_get_command_for_image_proc (SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config) GimpProcedureConfig *config)
{ {
@ -453,16 +450,12 @@ script_fu_script_get_command_for_image_proc (SFScript *script,
/* scripts use integer ID's for Gimp objects. */ /* scripts use integer ID's for Gimp objects. */
g_string_append_printf (s, " %d", gimp_image_get_id (image)); g_string_append_printf (s, " %d", gimp_image_get_id (image));
/* Not pass n_drawables.
* An author must use Scheme functions for length of container of drawables.
*/
/* Append text repr for a container of all drawable ID's. /* Append text repr for a container of all drawable ID's.
* Even if script->drawable_arity = SF_PROC_IMAGE_SINGLE_DRAWABLE * Even if script->drawable_arity = SF_PROC_IMAGE_SINGLE_DRAWABLE
* since that means the inner run func takes many but will only process one. * since that means the inner run func takes many but will only process one.
* We are not adapting to an inner run func that expects a single numeric. * We are not adapting to an inner run func that expects a single numeric.
*/ */
script_fu_command_append_drawables (s, n_drawables, drawables); script_fu_command_append_drawables (s, drawables);
/* config contains the "other" args /* config contains the "other" args
* Iterate over the GimpValueArray. * Iterate over the GimpValueArray.
@ -744,4 +737,4 @@ gboolean
script_fu_script_get_is_old_style (SFScript *script) script_fu_script_get_is_old_style (SFScript *script)
{ {
return script->is_old_style; return script->is_old_style;
} }

1
plug-ins/script-fu/libscriptfu/script-fu-script.h
View file

@ -51,7 +51,6 @@ gchar * script_fu_script_get_command_from_params (SFScript *scrip
gchar * script_fu_script_get_command_for_image_proc ( gchar * script_fu_script_get_command_for_image_proc (
SFScript *script, SFScript *script,
GimpImage *image, GimpImage *image,
guint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config); GimpProcedureConfig *config);
gchar * script_fu_script_get_command_for_regular_proc ( gchar * script_fu_script_get_command_for_regular_proc (

2
plug-ins/selection-to-path/selection-to-path.c
View file

@ -79,7 +79,6 @@ static GimpProcedure * sel2path_create_procedure (GimpPlugIn *plug_in
static GimpValueArray * sel2path_run (GimpProcedure *procedure, static GimpValueArray * sel2path_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -314,7 +313,6 @@ static GimpValueArray *
sel2path_run (GimpProcedure *procedure, sel2path_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)

2
plug-ins/twain/twain.c
View file

@ -153,7 +153,6 @@ static GimpProcedure * twain_create_procedure (GimpPlugIn *plug_in,
static GimpValueArray * twain_run (GimpProcedure *procedure, static GimpValueArray * twain_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data); gpointer run_data);
@ -385,7 +384,6 @@ static GimpValueArray *
twain_run (GimpProcedure *procedure, twain_run (GimpProcedure *procedure,
GimpRunMode run_mode, GimpRunMode run_mode,
GimpImage *image, GimpImage *image,
gint n_drawables,
GimpDrawable **drawables, GimpDrawable **drawables,
GimpProcedureConfig *config, GimpProcedureConfig *config,
gpointer run_data) gpointer run_data)