diff --git a/extensions/goat-exercises/goat-exercise-c.c b/extensions/goat-exercises/goat-exercise-c.c index f5fd6001df..44e2b4c04c 100644 --- a/extensions/goat-exercises/goat-exercise-c.c +++ b/extensions/goat-exercises/goat-exercise-c.c @@ -64,7 +64,6 @@ static GimpProcedure * goat_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * goat_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -133,7 +132,6 @@ static GimpValueArray * goat_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -142,7 +140,7 @@ goat_run (GimpProcedure *procedure, GimpPDBStatusType status = GIMP_PDB_SUCCESS; gint x, y, width, height; - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/extensions/goat-exercises/goat-exercise-py3.py b/extensions/goat-exercises/goat-exercise-py3.py index 366b443053..d635d9494f 100755 --- a/extensions/goat-exercises/goat-exercise-py3.py +++ b/extensions/goat-exercises/goat-exercise-py3.py @@ -54,8 +54,8 @@ class Goat (Gimp.PlugIn): return procedure - def run(self, procedure, run_mode, image, n_drawables, drawables, config, run_data): - if n_drawables != 1: + def run(self, procedure, run_mode, image, drawables, config, run_data): + if len(drawables) != 1: msg = _("Procedure '{}' only works with one drawable.").format(procedure.get_name()) error = GLib.Error.new_literal(Gimp.PlugIn.error_quark(), msg, 0) return procedure.new_return_values(Gimp.PDBStatusType.CALLING_ERROR, error) diff --git a/libgimp/gimpimageprocedure.c b/libgimp/gimpimageprocedure.c index 4865d62f5b..c918db1c78 100644 --- a/libgimp/gimpimageprocedure.c +++ b/libgimp/gimpimageprocedure.c @@ -151,14 +151,12 @@ gimp_image_procedure_run (GimpProcedure *procedure, GimpRunMode run_mode; GimpImage *image; GimpDrawable **drawables; - gint n_drawables; gint i; run_mode = GIMP_VALUES_GET_ENUM (args, 0); image = GIMP_VALUES_GET_IMAGE (args, 1); 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); 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); _gimp_procedure_config_begin_run (config, image, run_mode, remaining, NULL); - return_values = image_proc->run_func (procedure, run_mode, - image, n_drawables, drawables, + return_values = image_proc->run_func (procedure, run_mode, image, drawables, config, image_proc->run_data); if (return_values != NULL && diff --git a/libgimp/gimpimageprocedure.h b/libgimp/gimpimageprocedure.h index f328508e44..eb76250aa8 100644 --- a/libgimp/gimpimageprocedure.h +++ b/libgimp/gimpimageprocedure.h @@ -34,8 +34,7 @@ G_BEGIN_DECLS * @procedure: the #GimpProcedure that runs. * @run_mode: the #GimpRunMode. * @image: the #GimpImage. - * @n_drawables: the number of #GimpDrawable-s. - * @drawables: (array length=n_drawables): the input #GimpDrawable-s. + * @drawables: (array zero-terminated=1): the input #GimpDrawable-s. * @config: the @procedure's remaining arguments. * @run_data: (closure): the run_data given in gimp_image_procedure_new(). * @@ -49,7 +48,6 @@ G_BEGIN_DECLS typedef GimpValueArray * (* GimpRunImageFunc) (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); diff --git a/libgimp/tests/c-test-header.c b/libgimp/tests/c-test-header.c index 2beb00e9c2..815d97d939 100644 --- a/libgimp/tests/c-test-header.c +++ b/libgimp/tests/c-test-header.c @@ -70,7 +70,6 @@ static GimpProcedure * gimp_c_test_create_procedure (GimpPlugIn *plug static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); diff --git a/libgimp/tests/test-color-parser.c b/libgimp/tests/test-color-parser.c index eb1ea7b0d2..9548f30525 100644 --- a/libgimp/tests/test-color-parser.c +++ b/libgimp/tests/test-color-parser.c @@ -93,7 +93,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/libgimp/tests/test-export-options.c b/libgimp/tests/test-export-options.c index 467b0223b2..94b1b56e9d 100644 --- a/libgimp/tests/test-export-options.c +++ b/libgimp/tests/test-export-options.c @@ -8,7 +8,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/libgimp/tests/test-image.c b/libgimp/tests/test-image.c index 2b5d2b7417..4e812dbf90 100644 --- a/libgimp/tests/test-image.c +++ b/libgimp/tests/test-image.c @@ -8,7 +8,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/libgimp/tests/test-palette.c b/libgimp/tests/test-palette.c index 72523b08e8..51297f93f1 100644 --- a/libgimp/tests/test-palette.c +++ b/libgimp/tests/test-palette.c @@ -11,7 +11,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/libgimp/tests/test-selection-float.c b/libgimp/tests/test-selection-float.c index 8cbd973bc4..1cd1a7d1ac 100644 --- a/libgimp/tests/test-selection-float.c +++ b/libgimp/tests/test-selection-float.c @@ -3,7 +3,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/libgimp/tests/test-unit.c b/libgimp/tests/test-unit.c index 23ec03e8f2..2953361fa9 100644 --- a/libgimp/tests/test-unit.c +++ b/libgimp/tests/test-unit.c @@ -29,7 +29,6 @@ static GimpValueArray * gimp_c_test_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index fe1cb8c9b8..71f051b378 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -96,7 +96,6 @@ static GimpProcedure * align_layers_create_procedure (GimpPlugIn static GimpValueArray * align_layers_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -278,7 +277,6 @@ static GimpValueArray * align_layers_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/animation-optimize.c b/plug-ins/common/animation-optimize.c index 363a710373..998a6f64e1 100644 --- a/plug-ins/common/animation-optimize.c +++ b/plug-ins/common/animation-optimize.c @@ -86,7 +86,6 @@ static GimpProcedure * optimize_create_procedure (GimpPlugIn *plug_in static GimpValueArray * optimize_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -307,7 +306,6 @@ static GimpValueArray * optimize_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c index 682db6e7d8..3309e38175 100644 --- a/plug-ins/common/animation-play.c +++ b/plug-ins/common/animation-play.c @@ -97,7 +97,6 @@ static GimpProcedure * play_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * play_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -354,7 +353,6 @@ static GimpValueArray * play_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *_image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index 9d33f6c22a..3ea5d228fd 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -73,7 +73,6 @@ static GimpProcedure * blinds_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * blinds_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -185,7 +184,6 @@ static GimpValueArray * blinds_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -194,7 +192,7 @@ blinds_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index f723ccf716..005e2428ed 100644 --- a/plug-ins/common/border-average.c +++ b/plug-ins/common/border-average.c @@ -57,7 +57,6 @@ static GimpProcedure * border_average_create_procedure (GimpPlugIn static GimpValueArray * border_average_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -179,7 +178,6 @@ static GimpValueArray * border_average_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -192,7 +190,7 @@ border_average_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 2ba3acd3f9..739f254919 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -57,7 +57,6 @@ static GimpProcedure * checkerboard_create_procedure (GimpPlugIn *plu static GimpValueArray * checkerboard_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -159,7 +158,6 @@ static GimpValueArray * checkerboard_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -168,7 +166,7 @@ checkerboard_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index b4afe7863d..cd918a41bc 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -336,7 +336,6 @@ static GimpProcedure * explorer_create_procedure (GimpPlugIn *plug_in static GimpValueArray * explorer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -551,7 +550,6 @@ static GimpValueArray * explorer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -559,7 +557,7 @@ explorer_run (GimpProcedure *procedure, GBytes *settings_bytes = 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, _("Procedure '%s' only works with one drawable."), diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index cd00d17dbe..1b35b2bd0d 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -67,7 +67,6 @@ static GimpProcedure * remap_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * remap_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -248,7 +247,6 @@ static GimpValueArray * remap_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 748dff3cd9..f79458b91b 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -137,7 +137,6 @@ static GimpProcedure * compose_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * compose_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -558,7 +557,6 @@ static GimpValueArray * compose_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -576,7 +574,7 @@ compose_run (GimpProcedure *procedure, if (compose_by_drawable) { - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index 00485fd1a4..8e2c9ad4fe 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -86,7 +86,6 @@ static GimpProcedure * retinex_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * retinex_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -231,7 +230,6 @@ static GimpValueArray * retinex_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -241,7 +239,7 @@ retinex_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/crop-zealous.c b/plug-ins/common/crop-zealous.c index eef300e492..f6b0fc5704 100644 --- a/plug-ins/common/crop-zealous.c +++ b/plug-ins/common/crop-zealous.c @@ -55,7 +55,6 @@ static GimpProcedure * crop_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * crop_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -132,7 +131,6 @@ static GimpValueArray * crop_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -143,7 +141,7 @@ crop_run (GimpProcedure *procedure, gimp_progress_init (_("Zealous cropping")); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 9eb6945395..d89c238b9f 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -237,7 +237,6 @@ static GimpProcedure * bender_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * bender_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -601,7 +600,6 @@ static GimpValueArray * bender_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -617,7 +615,7 @@ bender_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 438e2dad2b..ca17f21c76 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -98,7 +98,6 @@ static GimpProcedure * decompose_create_procedure (GimpPlugIn *plug_i static GimpValueArray * decompose_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -362,7 +361,6 @@ static GimpValueArray * decompose_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -379,7 +377,7 @@ decompose_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index 9ff2d9f97e..9d4342f501 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -92,7 +92,6 @@ static GimpProcedure * merge_create_procedure (GimpPlugIn static GimpValueArray * merge_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -275,7 +274,6 @@ static GimpValueArray * merge_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -285,7 +283,7 @@ merge_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 8f29ec0f83..fdf19a75d5 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -92,7 +92,6 @@ static GimpProcedure * despeckle_create_procedure (GimpPlugIn *plug_i static GimpValueArray * despeckle_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -218,7 +217,6 @@ static GimpValueArray * despeckle_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -227,7 +225,7 @@ despeckle_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index a9b6f382fe..d3aa43c021 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -64,7 +64,6 @@ static GimpProcedure * destripe_create_procedure (GimpPlugIn *plug_in static GimpValueArray * destripe_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -158,7 +157,6 @@ static GimpValueArray * destripe_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -167,7 +165,7 @@ destripe_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index cb4291fd20..2168af0c9d 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -77,7 +77,6 @@ static GimpProcedure * film_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * film_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -317,7 +316,6 @@ static GimpValueArray * film_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c index 441ee5670f..1d2cc238c3 100644 --- a/plug-ins/common/gradient-map.c +++ b/plug-ins/common/gradient-map.c @@ -66,7 +66,6 @@ static GimpProcedure * map_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * map_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -196,7 +195,6 @@ static GimpValueArray * map_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -208,7 +206,7 @@ map_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index e48ab37fac..42cd2affff 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -86,7 +86,6 @@ static GimpProcedure * grid_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * grid_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -266,7 +265,6 @@ static GimpValueArray * grid_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -275,7 +273,7 @@ grid_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/guillotine.c b/plug-ins/common/guillotine.c index 8b5f4b8839..568894a0da 100644 --- a/plug-ins/common/guillotine.c +++ b/plug-ins/common/guillotine.c @@ -57,7 +57,6 @@ static GimpProcedure * guillotine_create_procedure (GimpPlugIn *plug_ static GimpValueArray * guillotine_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -139,7 +138,6 @@ static GimpValueArray * guillotine_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 6d59cb7b58..83286df8de 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -156,7 +156,6 @@ static GimpProcedure * hot_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * hot_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -299,7 +298,6 @@ static GimpValueArray * hot_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -308,7 +306,7 @@ hot_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index c57af8dfbe..faba37ef78 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -199,7 +199,6 @@ static GimpProcedure * jigsaw_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * jigsaw_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -451,7 +450,6 @@ static GimpValueArray * jigsaw_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -460,7 +458,7 @@ jigsaw_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index 8b43dcd40e..03859b051f 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -78,14 +78,12 @@ static GimpProcedure * mail_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * mail_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); static GimpPDBStatusType send_image (GObject *config, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, gint32 run_mode); @@ -245,7 +243,6 @@ static GimpValueArray * mail_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -274,10 +271,7 @@ mail_run (GimpProcedure *procedure, return gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL); } - status = send_image (G_OBJECT (config), - image, - n_drawables, drawables, - run_mode); + status = send_image (G_OBJECT (config), image, drawables, run_mode); return gimp_procedure_new_return_values (procedure, status, NULL); } @@ -285,7 +279,6 @@ mail_run (GimpProcedure *procedure, static GimpPDBStatusType send_image (GObject *config, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, gint32 run_mode) { diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index 34a5b01112..ee7be69e5f 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -84,7 +84,6 @@ static GimpProcedure * nlfilter_create_procedure (GimpPlugIn *plug_in static GimpValueArray * nlfilter_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -200,7 +199,6 @@ static GimpValueArray * nlfilter_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -209,7 +207,7 @@ nlfilter_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index 87fd871d70..a305c8e109 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -110,7 +110,6 @@ static GimpProcedure * qbist_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * qbist_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -229,7 +228,6 @@ static GimpValueArray * qbist_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -248,7 +246,7 @@ qbist_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index ef7fd75d8c..8f514b7318 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -186,7 +186,6 @@ static GimpProcedure * colorize_create_procedure (GimpPlugIn *plug_in static GimpValueArray * colorize_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -409,7 +408,6 @@ static GimpValueArray * colorize_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -419,7 +417,7 @@ colorize_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 9c50ed8fec..9605de28c7 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -60,7 +60,6 @@ static GimpProcedure * palette_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * palette_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -175,7 +174,6 @@ static GimpValueArray * palette_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -187,7 +185,7 @@ palette_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index dc40e4449f..0ce5508f1a 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -76,7 +76,6 @@ static GimpProcedure * sparkle_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * sparkle_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -285,7 +284,6 @@ static GimpValueArray * sparkle_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -295,7 +293,7 @@ sparkle_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 8dd4bc5be1..7d018c8adc 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -283,7 +283,6 @@ static GimpProcedure * designer_create_procedure (GimpPlugIn *plug_in static GimpValueArray * designer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -3186,7 +3185,6 @@ static GimpValueArray * designer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -3197,7 +3195,7 @@ designer_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index 0fe9131546..f8b80b4257 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -109,7 +109,6 @@ static GimpProcedure * tile_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * tile_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -295,7 +294,6 @@ static GimpValueArray * tile_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -306,7 +304,7 @@ tile_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 8a67b2f770..667b89de9d 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -59,7 +59,6 @@ static GimpProcedure * tile_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * tile_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -195,7 +194,6 @@ static GimpValueArray * tile_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -210,7 +208,7 @@ tile_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index 97627936cd..dec880f01e 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -88,7 +88,6 @@ static GimpProcedure * lic_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * lic_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -227,7 +226,6 @@ static GimpValueArray * lic_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -236,7 +234,7 @@ lic_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index c978aa0873..aa01bf3425 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -114,7 +114,6 @@ static GimpProcedure * warp_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * warp_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -328,7 +327,6 @@ static GimpValueArray * warp_run (GimpProcedure *procedure, GimpRunMode _run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -338,7 +336,7 @@ warp_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c index 40ff381508..979a0aff3a 100644 --- a/plug-ins/common/wavelet-decompose.c +++ b/plug-ins/common/wavelet-decompose.c @@ -58,7 +58,6 @@ static GimpProcedure * wavelet_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * wavelet_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -155,7 +154,6 @@ static GimpValueArray * wavelet_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -173,7 +171,7 @@ wavelet_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 11be53d4fc..0810455a02 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -88,7 +88,6 @@ static GimpProcedure * flame_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * flame_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *proc_config, gpointer run_data); @@ -281,7 +280,6 @@ static GimpValueArray * flame_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *proc_config, gpointer run_data) @@ -291,7 +289,7 @@ flame_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index a2365bf269..9f5c962dbf 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -96,7 +96,6 @@ static GimpProcedure * explorer_create_procedure (GimpPlugIn *plug_in static GimpValueArray * explorer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -407,7 +406,6 @@ static GimpValueArray * explorer_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -421,7 +419,7 @@ explorer_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index b7f342093c..526b1cb506 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -68,7 +68,6 @@ static GimpProcedure * gfig_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * gfig_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -197,7 +196,6 @@ static GimpValueArray * gfig_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -207,7 +205,7 @@ gfig_run (GimpProcedure *procedure, gint pwidth, pheight; GimpGfig *gfig; - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/gimpressionist/gimp.c b/plug-ins/gimpressionist/gimp.c index ec6f2bd17a..2072dba5e9 100644 --- a/plug-ins/gimpressionist/gimp.c +++ b/plug-ins/gimpressionist/gimp.c @@ -62,7 +62,6 @@ static GimpProcedure * gimpressionist_create_procedure (GimpPlugIn *p static GimpValueArray * gimpressionist_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -166,7 +165,6 @@ static GimpValueArray * gimpressionist_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -176,7 +174,7 @@ gimpressionist_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index f05ddbd853..68bed7cab2 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -378,7 +378,6 @@ static GimpProcedure * gflare_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * gflare_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -906,7 +905,6 @@ static GimpValueArray * gflare_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *_image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -917,7 +915,7 @@ gflare_run (GimpProcedure *procedure, image = _image; - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index e11de865f9..10d9c384d1 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -206,7 +206,6 @@ static GimpProcedure * ifs_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * ifs_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -465,7 +464,6 @@ static GimpValueArray * ifs_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -485,7 +483,7 @@ ifs_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c index 22a557661b..67a3e61b66 100644 --- a/plug-ins/imagemap/imap_main.c +++ b/plug-ins/imagemap/imap_main.c @@ -74,7 +74,6 @@ static GimpProcedure * imap_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * imap_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -239,7 +238,6 @@ static GimpValueArray * imap_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -258,7 +256,7 @@ imap_run (GimpProcedure *procedure, 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; diff --git a/plug-ins/lighting/lighting-main.c b/plug-ins/lighting/lighting-main.c index 1a853ab550..64d8694e51 100644 --- a/plug-ins/lighting/lighting-main.c +++ b/plug-ins/lighting/lighting-main.c @@ -64,7 +64,6 @@ static GimpProcedure * lighting_create_procedure (GimpPlugIn *plug_in static GimpValueArray * lighting_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -762,7 +761,6 @@ static GimpValueArray * lighting_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -771,7 +769,7 @@ lighting_run (GimpProcedure *procedure, gegl_init (NULL, NULL); - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/map-object/map-object-main.c b/plug-ins/map-object/map-object-main.c index 13e731cdef..74f8cd1cbb 100644 --- a/plug-ins/map-object/map-object-main.c +++ b/plug-ins/map-object/map-object-main.c @@ -64,7 +64,6 @@ static GimpProcedure * map_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * map_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -115,8 +114,8 @@ map_create_procedure (GimpPlugIn *plug_in, default_color = gegl_color_new ("white"); procedure = gimp_image_procedure_new (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - map_run, NULL, NULL); + GIMP_PDB_PROC_TYPE_PLUGIN, + map_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -520,7 +519,6 @@ static GimpValueArray * map_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *_image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -531,7 +529,7 @@ map_run (GimpProcedure *procedure, image = _image; - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c index 3777c2b76e..70fa37a849 100644 --- a/plug-ins/metadata/metadata-editor.c +++ b/plug-ins/metadata/metadata-editor.c @@ -74,7 +74,6 @@ static GimpProcedure * metadata_create_procedure (GimpPlugIn *plug_in static GimpValueArray * metadata_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -783,7 +782,6 @@ static GimpValueArray * metadata_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c index 8b0e025294..1c0ba3ac95 100644 --- a/plug-ins/metadata/metadata-viewer.c +++ b/plug-ins/metadata/metadata-viewer.c @@ -95,7 +95,6 @@ static GimpProcedure * metadata_create_procedure (GimpPlugIn *plug_in static GimpValueArray * metadata_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -203,7 +202,6 @@ static GimpValueArray * metadata_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 3d88f27022..b8c756639f 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -118,7 +118,6 @@ static GimpProcedure * pagecurl_create_procedure (GimpPlugIn *plug_in static GimpValueArray * pagecurl_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -279,7 +278,6 @@ static GimpValueArray * pagecurl_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *_image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) @@ -291,7 +289,7 @@ pagecurl_run (GimpProcedure *procedure, image = _image; - if (n_drawables != 1) + if (gimp_core_object_array_get_length ((GObject **) drawables) != 1) { GError *error = NULL; diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c index c277c6a4dd..b3d69ad790 100644 --- a/plug-ins/print/print.c +++ b/plug-ins/print/print.c @@ -70,7 +70,6 @@ static GimpProcedure * print_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * print_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -213,7 +212,6 @@ static GimpValueArray * print_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/python/foggify.py b/plug-ins/python/foggify.py index f3fed1c9af..52506fd866 100755 --- a/plug-ins/python/foggify.py +++ b/plug-ins/python/foggify.py @@ -30,7 +30,7 @@ import sys def N_(message): return 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: GimpUi.init('python-fu-foggify') diff --git a/plug-ins/python/histogram-export.py b/plug-ins/python/histogram-export.py index 4067130f8b..39e5b70ef6 100644 --- a/plug-ins/python/histogram-export.py +++ b/plug-ins/python/histogram-export.py @@ -163,8 +163,7 @@ def histogram_export(procedure, img, layers, gio_file, return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error()) - -def run(procedure, run_mode, image, n_layers, layers, config, data): +def run(procedure, run_mode, image, layers, config, data): if run_mode == Gimp.RunMode.INTERACTIVE: GimpUi.init("python-fu-histogram-export") diff --git a/plug-ins/python/spyro-plus.py b/plug-ins/python/spyro-plus.py index 0854d4bc54..c1d46a4efe 100755 --- a/plug-ins/python/spyro-plus.py +++ b/plug-ins/python/spyro-plus.py @@ -2309,7 +2309,7 @@ class SpyrogimpPlusPlugin(Gimp.PlugIn): return procedure # 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') shape=config.get_property('shape') sides=config.get_property('sides') diff --git a/plug-ins/python/test-dialog.py b/plug-ins/python/test-dialog.py index 0693de71d4..e368fc0729 100644 --- a/plug-ins/python/test-dialog.py +++ b/plug-ins/python/test-dialog.py @@ -94,7 +94,7 @@ def process_args(brush, font, gradient, palette, pattern): 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. ''' diff --git a/plug-ins/python/tests/test-file-plug-ins/test-file-plug-ins.py b/plug-ins/python/tests/test-file-plug-ins/test-file-plug-ins.py index d9cb3cccaf..fb7a344b21 100755 --- a/plug-ins/python/tests/test-file-plug-ins/test-file-plug-ins.py +++ b/plug-ins/python/tests/test-file-plug-ins/test-file-plug-ins.py @@ -99,7 +99,7 @@ class PythonTest (Gimp.PlugIn): self.log = GimpLogger(True, self.test_cfg.log_file, LOG_APPEND, PRINT_VERBOSE, DEBUGGING) def run_import_tests(self, procedure, _run_mode, _image, - _n_drawables, _drawable, _config, _data): + _drawable, _config, _data): self.init_logging() if self.log.enabled: @@ -109,7 +109,7 @@ class PythonTest (Gimp.PlugIn): return procedure.new_return_values(Gimp.PDBStatusType.SUCCESS, GLib.Error()) def run_export_tests(self, procedure, _run_mode, _image, - _n_drawables, _drawable, _config, _data): + _drawable, _config, _data): self.init_logging() if self.log.enabled: diff --git a/plug-ins/script-fu/libscriptfu/script-fu-arg.c b/plug-ins/script-fu/libscriptfu/script-fu-arg.c index 25165471f5..5cea0b0997 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-arg.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-arg.c @@ -786,7 +786,7 @@ script_fu_arg_reset_name_generator (void) * Thus name meets uniquity for names of properties of one object. * * !!! 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" * * The name means nothing to human readers of the spec. diff --git a/plug-ins/script-fu/libscriptfu/script-fu-command.c b/plug-ins/script-fu/libscriptfu/script-fu-command.c index fa8322e118..588bb99b64 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-command.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-command.c @@ -147,14 +147,13 @@ GimpValueArray * script_fu_interpret_image_proc (GimpProcedure *procedure, SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config) { gchar *command; 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); g_free (command); return result; diff --git a/plug-ins/script-fu/libscriptfu/script-fu-command.h b/plug-ins/script-fu/libscriptfu/script-fu-command.h index 49411969b9..5b23dac020 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-command.h +++ b/plug-ins/script-fu/libscriptfu/script-fu-command.h @@ -24,7 +24,6 @@ gboolean script_fu_run_command (const gchar *command, GimpValueArray *script_fu_interpret_image_proc (GimpProcedure *procedure, SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config); GimpValueArray *script_fu_interpret_regular_proc ( diff --git a/plug-ins/script-fu/libscriptfu/script-fu-dialog.c b/plug-ins/script-fu/libscriptfu/script-fu-dialog.c index 60965357c3..f8faea36c8 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-dialog.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-dialog.c @@ -233,7 +233,6 @@ script_fu_dialog_run_image_proc ( GimpProcedure *procedure, SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config) @@ -249,7 +248,7 @@ script_fu_dialog_run_image_proc ( if (not_canceled) result = script_fu_interpret_image_proc (procedure, script, - image, n_drawables, drawables, + image, drawables, config); else result = gimp_procedure_new_return_values (procedure, GIMP_PDB_CANCEL, NULL); diff --git a/plug-ins/script-fu/libscriptfu/script-fu-dialog.h b/plug-ins/script-fu/libscriptfu/script-fu-dialog.h index 11c34b14fa..4feff24dda 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-dialog.h +++ b/plug-ins/script-fu/libscriptfu/script-fu-dialog.h @@ -25,7 +25,6 @@ GimpValueArray *script_fu_dialog_run_image_proc ( GimpProcedure *procedure, SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config); GimpValueArray *script_fu_dialog_run_regular_proc ( diff --git a/plug-ins/script-fu/libscriptfu/script-fu-run-func.c b/plug-ins/script-fu/libscriptfu/script-fu-run-func.c index 7a10024031..9af8790a95 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-run-func.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-run-func.c @@ -65,7 +65,6 @@ GimpValueArray * script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProcedure */ GimpRunMode run_mode, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer data) @@ -99,12 +98,12 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc if (n_specs > 1) { /* 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 { /* 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; } @@ -114,7 +113,7 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc * Use the given config, without interacting with user. * 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; } 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". * 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; } default: diff --git a/plug-ins/script-fu/libscriptfu/script-fu-run-func.h b/plug-ins/script-fu/libscriptfu/script-fu-run-func.h index a97b100148..b21b621b62 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-run-func.h +++ b/plug-ins/script-fu/libscriptfu/script-fu-run-func.h @@ -25,7 +25,6 @@ GimpValueArray *script_fu_run_procedure (GimpProcedure *procedure, GimpValueArray *script_fu_run_image_procedure (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer data); diff --git a/plug-ins/script-fu/libscriptfu/script-fu-script.c b/plug-ins/script-fu/libscriptfu/script-fu-script.c index 1220abce84..9c5294b638 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-script.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-script.c @@ -54,7 +54,6 @@ static void script_fu_script_set_drawable_sensitivity ( static void script_fu_command_append_drawables ( GString *s, - guint n_drawables, GimpDrawable **drawables); /* * 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, * and we don't add to formal args in PDB. * 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. */ script_fu_script_set_proc_args (procedure, script, 0); @@ -411,17 +410,16 @@ script_fu_script_get_command_from_params (SFScript *script, */ static void script_fu_command_append_drawables (GString *s, - guint n_drawables, GimpDrawable **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. * #() is scheme syntax for a vector. */ 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])); } @@ -433,7 +431,6 @@ script_fu_command_append_drawables (GString *s, gchar * script_fu_script_get_command_for_image_proc (SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config) { @@ -453,16 +450,12 @@ script_fu_script_get_command_for_image_proc (SFScript *script, /* scripts use integer ID's for Gimp objects. */ 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. * Even if script->drawable_arity = SF_PROC_IMAGE_SINGLE_DRAWABLE * 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. */ - script_fu_command_append_drawables (s, n_drawables, drawables); + script_fu_command_append_drawables (s, drawables); /* config contains the "other" args * Iterate over the GimpValueArray. @@ -744,4 +737,4 @@ gboolean script_fu_script_get_is_old_style (SFScript *script) { return script->is_old_style; -} \ No newline at end of file +} diff --git a/plug-ins/script-fu/libscriptfu/script-fu-script.h b/plug-ins/script-fu/libscriptfu/script-fu-script.h index 6c73411ab6..3de556097f 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-script.h +++ b/plug-ins/script-fu/libscriptfu/script-fu-script.h @@ -51,7 +51,6 @@ gchar * script_fu_script_get_command_from_params (SFScript *scrip gchar * script_fu_script_get_command_for_image_proc ( SFScript *script, GimpImage *image, - guint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config); gchar * script_fu_script_get_command_for_regular_proc ( diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c index 266f41fb7a..12187239e1 100644 --- a/plug-ins/selection-to-path/selection-to-path.c +++ b/plug-ins/selection-to-path/selection-to-path.c @@ -79,7 +79,6 @@ static GimpProcedure * sel2path_create_procedure (GimpPlugIn *plug_in static GimpValueArray * sel2path_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -314,7 +313,6 @@ static GimpValueArray * sel2path_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data) diff --git a/plug-ins/twain/twain.c b/plug-ins/twain/twain.c index 39d6d9d515..c1254ea5a2 100644 --- a/plug-ins/twain/twain.c +++ b/plug-ins/twain/twain.c @@ -153,7 +153,6 @@ static GimpProcedure * twain_create_procedure (GimpPlugIn *plug_in, static GimpValueArray * twain_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data); @@ -385,7 +384,6 @@ static GimpValueArray * twain_run (GimpProcedure *procedure, GimpRunMode run_mode, GimpImage *image, - gint n_drawables, GimpDrawable **drawables, GimpProcedureConfig *config, gpointer run_data)