diff --git a/extensions/goat-exercises/goat-exercise-c.c b/extensions/goat-exercises/goat-exercise-c.c index f4e0ba3baa..d80f33c734 100644 --- a/extensions/goat-exercises/goat-exercise-c.c +++ b/extensions/goat-exercises/goat-exercise-c.c @@ -103,9 +103,9 @@ goat_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - goat_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + goat_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/extensions/goat-exercises/goat-exercise-gjs.js b/extensions/goat-exercises/goat-exercise-gjs.js index 974696a562..d7f18c8151 100755 --- a/extensions/goat-exercises/goat-exercise-gjs.js +++ b/extensions/goat-exercises/goat-exercise-gjs.js @@ -72,7 +72,7 @@ var Goat = GObject.registerClass({ return procedure; } - run(procedure, run_mode, image, drawables, args, run_data) { + run(procedure, run_mode, image, drawables, config, run_data) { /* TODO: localization. */ if (drawables.length != 1) { diff --git a/extensions/goat-exercises/goat-exercise-lua.lua b/extensions/goat-exercises/goat-exercise-lua.lua index 9bf0693ddd..3c1b229d95 100755 --- a/extensions/goat-exercises/goat-exercise-lua.lua +++ b/extensions/goat-exercises/goat-exercise-lua.lua @@ -41,7 +41,7 @@ function _(message) return GLib.dgettext(nil, message); end -function run(procedure, run_mode, image, drawables, args, run_data) +function run(procedure, run_mode, image, drawables, config, run_data) -- procedure:new_return_values() crashes LGI so we construct the -- GimpValueArray manually. local retval = Gimp.ValueArray(1) diff --git a/extensions/goat-exercises/goat-exercise-py3.py b/extensions/goat-exercises/goat-exercise-py3.py index 355b5b7479..2674831f1c 100755 --- a/extensions/goat-exercises/goat-exercise-py3.py +++ b/extensions/goat-exercises/goat-exercise-py3.py @@ -37,8 +37,8 @@ class Goat (Gimp.PlugIn): def do_create_procedure(self, name): procedure = Gimp.ImageProcedure.new(self, name, - Gimp.PDBProcType.PLUGIN, - self.run, None) + Gimp.PDBProcType.PLUGIN, + self.run, None) procedure.set_image_types("*") procedure.set_sensitivity_mask (Gimp.ProcedureSensitivityMask.DRAWABLE) @@ -54,7 +54,7 @@ class Goat (Gimp.PlugIn): return procedure - def run(self, procedure, run_mode, image, n_drawables, drawables, args, run_data): + def run(self, procedure, run_mode, image, n_drawables, drawables, config, run_data): if n_drawables != 1: msg = _("Procedure '{}' only works with one drawable.").format(procedure.get_name()) error = GLib.Error.new_literal(Gimp.PlugIn.error_quark(), msg, 0) diff --git a/extensions/goat-exercises/goat-exercise-vala.vala b/extensions/goat-exercises/goat-exercise-vala.vala index 6e7d07d3de..6b0348a81f 100755 --- a/extensions/goat-exercises/goat-exercise-vala.vala +++ b/extensions/goat-exercises/goat-exercise-vala.vala @@ -57,7 +57,7 @@ public class Goat : Gimp.PlugIn { Gimp.RunMode run_mode, Gimp.Image image, Gimp.Drawable[] drawables, - Gimp.ValueArray args) { + Gimp.ProcedureConfig config) { var drawable = drawables[0]; if (run_mode == Gimp.RunMode.INTERACTIVE) { diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 0940f5faeb..aac46a1e17 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -471,7 +471,6 @@ EXPORTS gimp_image_policy_rotate gimp_image_procedure_get_type gimp_image_procedure_new - gimp_image_procedure_new2 gimp_image_raise_item gimp_image_raise_item_to_top gimp_image_remove_channel diff --git a/libgimp/gimpimageprocedure.c b/libgimp/gimpimageprocedure.c index a1a2c7f2da..836ad5b71e 100644 --- a/libgimp/gimpimageprocedure.c +++ b/libgimp/gimpimageprocedure.c @@ -48,7 +48,6 @@ struct _GimpImageProcedurePrivate { GimpRunImageFunc run_func; - GimpRunImageFunc2 run_func2; gpointer run_data; GDestroyNotify run_data_destroy; }; @@ -145,14 +144,16 @@ static GimpValueArray * gimp_image_procedure_run (GimpProcedure *procedure, const GimpValueArray *args) { - GimpImageProcedure *image_proc = GIMP_IMAGE_PROCEDURE (procedure); - GimpValueArray *remaining; - GimpValueArray *return_values; - GimpRunMode run_mode; - GimpImage *image; - GimpDrawable **drawables; - gint n_drawables; - gint i; + GimpImageProcedure *image_proc = GIMP_IMAGE_PROCEDURE (procedure); + GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; + GimpProcedureConfig *config; + GimpValueArray *remaining; + GimpValueArray *return_values; + 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); @@ -168,45 +169,31 @@ gimp_image_procedure_run (GimpProcedure *procedure, gimp_value_array_append (remaining, value); } - if (image_proc->priv->run_func2) - { - GimpProcedureConfig *config; - GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; + config = gimp_procedure_create_config (procedure); + gimp_procedure_config_begin_run (config, image, run_mode, remaining); - config = gimp_procedure_create_config (procedure); - gimp_procedure_config_begin_run (config, image, run_mode, remaining); + return_values = image_proc->priv->run_func (procedure, + run_mode, + image, n_drawables, drawables, + config, + image_proc->priv->run_data); - return_values = image_proc->priv->run_func2 (procedure, - run_mode, - image, n_drawables, drawables, - config, - image_proc->priv->run_data); + if (return_values != NULL && + gimp_value_array_length (return_values) > 0 && + G_VALUE_HOLDS_ENUM (gimp_value_array_index (return_values, 0))) + status = GIMP_VALUES_GET_ENUM (return_values, 0); - if (return_values != NULL && - gimp_value_array_length (return_values) > 0 && - G_VALUE_HOLDS_ENUM (gimp_value_array_index (return_values, 0))) - status = GIMP_VALUES_GET_ENUM (return_values, 0); + gimp_procedure_config_end_run (config, status); - gimp_procedure_config_end_run (config, status); + /* This is debug printing to help plug-in developers figure out best + * practices. + */ + if (G_OBJECT (config)->ref_count > 1) + g_printerr ("%s: ERROR: the GimpProcedureConfig object was refed " + "by plug-in, it MUST NOT do that!\n", G_STRFUNC); - /* This is debug printing to help plug-in developers figure out best - * practices. - */ - if (G_OBJECT (config)->ref_count > 1) - g_printerr ("%s: ERROR: the GimpProcedureConfig object was refed " - "by plug-in, it MUST NOT do that!\n", G_STRFUNC); - - g_object_unref (config); - } - else - { - return_values = image_proc->priv->run_func (procedure, - run_mode, - image, n_drawables, drawables, - remaining, - image_proc->priv->run_data); - } + g_object_unref (config); gimp_value_array_unref (remaining); return return_values; @@ -272,7 +259,7 @@ gimp_image_procedure_set_sensitivity (GimpProcedure *procedure, * * Since: 3.0 **/ -GimpProcedure * +GimpProcedure * gimp_image_procedure_new (GimpPlugIn *plug_in, const gchar *name, GimpPDBProcType proc_type, @@ -300,32 +287,3 @@ gimp_image_procedure_new (GimpPlugIn *plug_in, return GIMP_PROCEDURE (procedure); } - -GimpProcedure * -gimp_image_procedure_new2 (GimpPlugIn *plug_in, - const gchar *name, - GimpPDBProcType proc_type, - GimpRunImageFunc2 run_func, - gpointer run_data, - GDestroyNotify run_data_destroy) -{ - GimpImageProcedure *procedure; - - g_return_val_if_fail (GIMP_IS_PLUG_IN (plug_in), NULL); - g_return_val_if_fail (gimp_is_canonical_identifier (name), NULL); - g_return_val_if_fail (proc_type != GIMP_PDB_PROC_TYPE_INTERNAL, NULL); - g_return_val_if_fail (proc_type != GIMP_PDB_PROC_TYPE_EXTENSION, NULL); - g_return_val_if_fail (run_func != NULL, NULL); - - procedure = g_object_new (GIMP_TYPE_IMAGE_PROCEDURE, - "plug-in", plug_in, - "name", name, - "procedure-type", proc_type, - NULL); - - procedure->priv->run_func2 = run_func; - procedure->priv->run_data = run_data; - procedure->priv->run_data_destroy = run_data_destroy; - - return GIMP_PROCEDURE (procedure); -} diff --git a/libgimp/gimpimageprocedure.h b/libgimp/gimpimageprocedure.h index 8dfd823dc7..75a902f513 100644 --- a/libgimp/gimpimageprocedure.h +++ b/libgimp/gimpimageprocedure.h @@ -36,7 +36,7 @@ G_BEGIN_DECLS * @image: the #GimpImage. * @n_drawables: the number of #GimpDrawable-s. * @drawables: (array length=n_drawables): the input #GimpDrawable-s. - * @args: the @procedure's remaining arguments. + * @config: the @procedure's remaining arguments. * @run_data: (closure): the run_data given in gimp_image_procedure_new(). * * The image function is run during the lifetime of the GIMP session, @@ -51,34 +51,9 @@ typedef GimpValueArray * (* GimpRunImageFunc) (GimpProcedure *procedure, GimpImage *image, gint n_drawables, GimpDrawable **drawables, - const GimpValueArray *args, + GimpProcedureConfig *config, gpointer run_data); -/** - * GimpRunImageFunc2: - * @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. - * @config: the @procedure's remaining arguments. - * @run_data: (closure): the run_data given in gimp_image_procedure_new(). - * - * The image function is run during the lifetime of the GIMP session, - * each time a plug-in image procedure is called. - * - * Returns: (transfer full): the @procedure's return values. - * - * Since: 3.0 - **/ -typedef GimpValueArray * (* GimpRunImageFunc2) (GimpProcedure *procedure, - GimpRunMode run_mode, - GimpImage *image, - gint n_drawables, - GimpDrawable **drawables, - GimpProcedureConfig *config, - gpointer run_data); - #define GIMP_TYPE_IMAGE_PROCEDURE (gimp_image_procedure_get_type ()) #define GIMP_IMAGE_PROCEDURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROCEDURE, GimpImageProcedure)) @@ -113,12 +88,6 @@ GimpProcedure * gimp_image_procedure_new (GimpPlugIn *plug_in, GimpRunImageFunc run_func, gpointer run_data, GDestroyNotify run_data_destroy); -GimpProcedure * gimp_image_procedure_new2 (GimpPlugIn *plug_in, - const gchar *name, - GimpPDBProcType proc_type, - GimpRunImageFunc2 run_func, - gpointer run_data, - GDestroyNotify run_data_destroy); G_END_DECLS diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 8c49b7b619..655189f8c6 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -166,9 +166,9 @@ align_layers_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - align_layers_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + align_layers_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/animation-optimize.c b/plug-ins/common/animation-optimize.c index 012bd18a51..d798fb4a5f 100644 --- a/plug-ins/common/animation-optimize.c +++ b/plug-ins/common/animation-optimize.c @@ -167,9 +167,9 @@ optimize_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, OPTIMIZE_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - optimize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + optimize_run, NULL, NULL); gimp_procedure_set_sensitivity_mask (procedure, GIMP_PROCEDURE_SENSITIVE_DRAWABLE | @@ -195,9 +195,9 @@ optimize_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, OPTIMIZE_DIFF_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - optimize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + optimize_run, NULL, NULL); gimp_procedure_set_sensitivity_mask (procedure, GIMP_PROCEDURE_SENSITIVE_DRAWABLE | @@ -220,9 +220,9 @@ optimize_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, UNOPTIMIZE_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - optimize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + optimize_run, NULL, NULL); gimp_procedure_set_sensitivity_mask (procedure, GIMP_PROCEDURE_SENSITIVE_DRAWABLE | @@ -242,9 +242,9 @@ optimize_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, REMOVE_BACKDROP_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - optimize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + optimize_run, NULL, NULL); gimp_procedure_set_sensitivity_mask (procedure, GIMP_PROCEDURE_SENSITIVE_DRAWABLE | @@ -263,9 +263,9 @@ optimize_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, FIND_BACKDROP_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - optimize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + optimize_run, NULL, NULL); gimp_procedure_set_sensitivity_mask (procedure, GIMP_PROCEDURE_SENSITIVE_DRAWABLE | diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c index dea0c088a2..fe061eb92d 100644 --- a/plug-ins/common/animation-play.c +++ b/plug-ins/common/animation-play.c @@ -317,9 +317,9 @@ play_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - play_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + play_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index df2c793518..ed4c0b729d 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -129,9 +129,9 @@ blinds_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - blinds_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + blinds_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c index a6a61108d1..61cdec2527 100644 --- a/plug-ins/common/border-average.c +++ b/plug-ins/common/border-average.c @@ -113,9 +113,9 @@ border_average_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - border_average_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + border_average_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 3e7be3cc8b..c8a78c69d6 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -111,9 +111,9 @@ checkerboard_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - checkerboard_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + checkerboard_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c index 6fe6b55710..e054d10154 100644 --- a/plug-ins/common/cml-explorer.c +++ b/plug-ins/common/cml-explorer.c @@ -497,9 +497,9 @@ explorer_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - explorer_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + explorer_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 36d06f08f2..ef1a9bc7da 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -173,9 +173,9 @@ remap_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC_REMAP)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - remap_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + remap_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "INDEXED*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -207,9 +207,9 @@ remap_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, PLUG_IN_PROC_SWAP)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - remap_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + remap_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "INDEXED*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 9f9bdf427f..088f40b78c 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -390,9 +390,9 @@ compose_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, COMPOSE_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - compose_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + compose_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -458,9 +458,9 @@ compose_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, DRAWABLE_COMPOSE_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - compose_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + compose_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -521,9 +521,9 @@ compose_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, RECOMPOSE_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - compose_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + compose_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c index 41119eb6b5..ace62d7339 100644 --- a/plug-ins/common/contrast-retinex.c +++ b/plug-ins/common/contrast-retinex.c @@ -167,9 +167,9 @@ retinex_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - retinex_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + retinex_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/crop-zealous.c b/plug-ins/common/crop-zealous.c index 7564b5cb7b..94a00ec176 100644 --- a/plug-ins/common/crop-zealous.c +++ b/plug-ins/common/crop-zealous.c @@ -103,9 +103,9 @@ crop_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - crop_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + crop_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c index 161822f9c6..a743462481 100644 --- a/plug-ins/common/curve-bend.c +++ b/plug-ins/common/curve-bend.c @@ -409,9 +409,9 @@ bender_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - bender_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + bender_run, NULL, NULL); gimp_procedure_set_image_types (procedure, PLUG_IN_IMAGE_TYPES); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index fbce2f02d4..18a51bb8be 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -271,9 +271,9 @@ decompose_create_procedure (GimpPlugIn *plug_in, g_string_append_c (type_desc, '"'); } - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - decompose_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + decompose_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c index cd571c05e9..0565a28fa5 100644 --- a/plug-ins/common/depth-merge.c +++ b/plug-ins/common/depth-merge.c @@ -193,9 +193,9 @@ merge_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - merge_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + merge_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c index 1528c693e8..9d2bde99bd 100644 --- a/plug-ins/common/despeckle.c +++ b/plug-ins/common/despeckle.c @@ -158,9 +158,9 @@ despeckle_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - despeckle_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + despeckle_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 25173eaa7f..1ede54e776 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -115,9 +115,9 @@ destripe_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - destripe_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + destripe_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index 58efcbcbfa..fa909d71ac 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -167,9 +167,9 @@ film_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - film_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + film_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c index e784f201ed..0ab2b7f275 100644 --- a/plug-ins/common/gradient-map.c +++ b/plug-ins/common/gradient-map.c @@ -119,11 +119,11 @@ map_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, GRADMAP_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - map_run, - GINT_TO_POINTER (GRADIENT_MODE), - NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + map_run, + GINT_TO_POINTER (GRADIENT_MODE), + NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -155,11 +155,11 @@ map_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, PALETTEMAP_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - map_run, - GINT_TO_POINTER (PALETTE_MODE), - NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + map_run, + GINT_TO_POINTER (PALETTE_MODE), + NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index 2c7267e735..588f8b6867 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -146,9 +146,9 @@ grid_create_procedure (GimpPlugIn *plug_in, { const GimpRGB black = { 0.0, 0.0, 0.0, 1.0 }; - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - grid_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + grid_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/guillotine.c b/plug-ins/common/guillotine.c index d2f1e7fab9..21fa347c23 100644 --- a/plug-ins/common/guillotine.c +++ b/plug-ins/common/guillotine.c @@ -99,9 +99,9 @@ guillotine_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - guillotine_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + guillotine_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 7456ef6fd4..780c2d3bf5 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -238,9 +238,9 @@ hot_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - hot_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + hot_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index dc402c4465..35347f8a82 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -387,9 +387,9 @@ jigsaw_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - jigsaw_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + jigsaw_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index e3e9f4d5ab..30a9f0e1d5 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -175,9 +175,9 @@ mail_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - mail_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + mail_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c index 89eae75dec..891a65b8d4 100644 --- a/plug-ins/common/nl-filter.c +++ b/plug-ins/common/nl-filter.c @@ -147,9 +147,9 @@ nlfilter_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - nlfilter_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + nlfilter_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB, GRAY"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c index f757fad9a6..0af31ecb14 100644 --- a/plug-ins/common/qbist.c +++ b/plug-ins/common/qbist.c @@ -174,9 +174,9 @@ qbist_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - qbist_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + qbist_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c index 5c646ee354..2517b8239d 100644 --- a/plug-ins/common/sample-colorize.c +++ b/plug-ins/common/sample-colorize.c @@ -315,9 +315,9 @@ colorize_create_procedure (GimpPlugIn *plug_in, " (the image with the dst_drawable is converted to RGB if necessary)" " The sample_drawable should be of type RGB or RGBA"; - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - colorize_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + colorize_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/smooth-palette.c b/plug-ins/common/smooth-palette.c index 2258ad0761..0840429e6a 100644 --- a/plug-ins/common/smooth-palette.c +++ b/plug-ins/common/smooth-palette.c @@ -110,9 +110,9 @@ palette_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - palette_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + palette_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 257ce923f2..00fd6d709a 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -166,9 +166,9 @@ sparkle_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - sparkle_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + sparkle_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c index 989a5b6d2e..6b25b31453 100644 --- a/plug-ins/common/sphere-designer.c +++ b/plug-ins/common/sphere-designer.c @@ -399,9 +399,9 @@ designer_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - designer_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + designer_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c index a7da4a769c..b9bc7ba8dd 100644 --- a/plug-ins/common/tile-small.c +++ b/plug-ins/common/tile-small.c @@ -260,9 +260,9 @@ tile_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - tile_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + tile_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 3ce772e119..584955741e 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -120,9 +120,9 @@ tile_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - tile_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + tile_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c index fe61a572de..9b494e3a79 100644 --- a/plug-ins/common/van-gogh-lic.c +++ b/plug-ins/common/van-gogh-lic.c @@ -867,9 +867,9 @@ lic_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - lic_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + lic_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index 9f0bcb6414..367fa12055 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -208,9 +208,9 @@ warp_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - warp_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + warp_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c index d81d64ce23..6f534f0f3d 100644 --- a/plug-ins/common/wavelet-decompose.c +++ b/plug-ins/common/wavelet-decompose.c @@ -107,9 +107,9 @@ wavelet_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - wavelet_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + wavelet_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/file-dds/dds.c b/plug-ins/file-dds/dds.c index 68ca756c51..8c0696bf51 100644 --- a/plug-ins/file-dds/dds.c +++ b/plug-ins/file-dds/dds.c @@ -315,9 +315,9 @@ dds_create_procedure (GimpPlugIn *plug_in, #if 0 else if (! strcmp (name, DECODE_YCOCG_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dds_decode, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dds_decode, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGBA"); gimp_procedure_set_sensitivity_mask (procedure, @@ -337,9 +337,9 @@ dds_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, DECODE_YCOCG_SCALED_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dds_decode, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dds_decode, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGBA"); gimp_procedure_set_sensitivity_mask (procedure, @@ -361,9 +361,9 @@ dds_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, DECODE_ALPHA_EXP_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dds_decode, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dds_decode, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGBA"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 380f7ffb5a..46d0d503a9 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -164,9 +164,9 @@ flame_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - flame_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + flame_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c index 19d0ca3150..f063766dc3 100644 --- a/plug-ins/fractal-explorer/fractal-explorer.c +++ b/plug-ins/fractal-explorer/fractal-explorer.c @@ -231,9 +231,9 @@ explorer_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - explorer_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + explorer_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c index 58a2a262bb..b7f342093c 100644 --- a/plug-ins/gfig/gfig.c +++ b/plug-ins/gfig/gfig.c @@ -159,9 +159,9 @@ gfig_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - gfig_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + gfig_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/gimpressionist/gimp.c b/plug-ins/gimpressionist/gimp.c index 2612a0d858..dad535d16f 100644 --- a/plug-ins/gimpressionist/gimp.c +++ b/plug-ins/gimpressionist/gimp.c @@ -110,9 +110,9 @@ gimpressionist_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - gimpressionist_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + gimpressionist_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index 53ab118f0c..760b80fd7f 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -798,9 +798,9 @@ gflare_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - gflare_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + gflare_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c index 5738c41420..759b42245f 100644 --- a/plug-ins/ifs-compose/ifs-compose.c +++ b/plug-ins/ifs-compose/ifs-compose.c @@ -422,9 +422,9 @@ ifs_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - ifs_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + ifs_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c index bb452ce36c..dc58530735 100644 --- a/plug-ins/imagemap/imap_main.c +++ b/plug-ins/imagemap/imap_main.c @@ -209,9 +209,9 @@ imap_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - imap_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + imap_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/lighting/lighting-main.c b/plug-ins/lighting/lighting-main.c index bd7b164054..e3bb3bb075 100644 --- a/plug-ins/lighting/lighting-main.c +++ b/plug-ins/lighting/lighting-main.c @@ -110,9 +110,9 @@ lighting_create_procedure (GimpPlugIn *plug_in, { GimpRGB white = { 1.0, 1.0, 1.0, 1.0 }; - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - lighting_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + lighting_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/map-object/map-object-main.c b/plug-ins/map-object/map-object-main.c index 78016bf2eb..f19fa5974f 100644 --- a/plug-ins/map-object/map-object-main.c +++ b/plug-ins/map-object/map-object-main.c @@ -110,7 +110,7 @@ map_create_procedure (GimpPlugIn *plug_in, { GimpRGB white = { 1.0, 1.0, 1.0, 1.0 }; - procedure = gimp_image_procedure_new2 (plug_in, name, + procedure = gimp_image_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, map_run, NULL, NULL); diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index a2847bd988..dbff0bea1a 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -205,9 +205,9 @@ pagecurl_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - pagecurl_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + pagecurl_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "RGB*, GRAY*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c index 5a6eb927fa..9d91a6c2a5 100644 --- a/plug-ins/print/print.c +++ b/plug-ins/print/print.c @@ -154,9 +154,9 @@ print_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PRINT_PROC_NAME)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - print_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + print_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, @@ -182,9 +182,9 @@ print_create_procedure (GimpPlugIn *plug_in, #ifndef EMBED_PAGE_SETUP else if (! strcmp (name, PAGE_SETUP_PROC_NAME)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - print_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + print_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); diff --git a/plug-ins/script-fu/libscriptfu/script-fu-script.c b/plug-ins/script-fu/libscriptfu/script-fu-script.c index 8daefa6ad0..2ef4853a95 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-script.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-script.c @@ -160,11 +160,11 @@ script_fu_script_create_PDB_procedure (GimpPlugIn *plug_in, g_debug ("script_fu_script_create_PDB_procedure: %s, plugin type %i, image_proc", script->name, plug_in_type); - procedure = gimp_image_procedure_new2 (plug_in, script->name, - plug_in_type, - (GimpRunImageFunc2) script_fu_run_image_procedure, - script, /* user_data, pointer in extension-script-fu process */ - NULL); + procedure = gimp_image_procedure_new (plug_in, script->name, + plug_in_type, + (GimpRunImageFunc) script_fu_run_image_procedure, + script, /* user_data, pointer in extension-script-fu process */ + NULL); script_fu_script_set_proc_metadata (procedure, script); diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c index 025d270645..e48a35bd8b 100644 --- a/plug-ins/selection-to-path/selection-to-path.c +++ b/plug-ins/selection-to-path/selection-to-path.c @@ -129,9 +129,9 @@ sel2path_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_PROC)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - sel2path_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + sel2path_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure, diff --git a/plug-ins/twain/twain.c b/plug-ins/twain/twain.c index 33e93b798d..7ab2c34940 100644 --- a/plug-ins/twain/twain.c +++ b/plug-ins/twain/twain.c @@ -193,9 +193,9 @@ twain_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, PLUG_IN_NAME)) { - procedure = gimp_image_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - twain_run, NULL, NULL); + procedure = gimp_image_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + twain_run, NULL, NULL); gimp_procedure_set_image_types (procedure, "*"); gimp_procedure_set_sensitivity_mask (procedure,