From 9e2a7e875967be54461fff3f97aaf5e9c3c37973 Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 6 Aug 2023 03:21:27 +0200 Subject: [PATCH] libgimp, plug-ins: rename gimp_load_procedure_new2() as gimp_load_procedure_new(). All C load procedures are now moved to the new API. --- libgimp/gimp.def | 1 - libgimp/gimploadprocedure.c | 224 +++++++++-------------- libgimp/gimploadprocedure.h | 61 +++--- plug-ins/common/file-cel.c | 6 +- plug-ins/common/file-compressor.c | 8 +- plug-ins/common/file-desktop-link.c | 6 +- plug-ins/common/file-dicom.c | 6 +- plug-ins/common/file-farbfeld.c | 6 +- plug-ins/common/file-gegl.c | 8 +- plug-ins/common/file-gif-load.c | 6 +- plug-ins/common/file-heif.c | 12 +- plug-ins/common/file-iff.c | 6 +- plug-ins/common/file-jp2-load.c | 12 +- plug-ins/common/file-jpegxl.c | 6 +- plug-ins/common/file-pcx.c | 12 +- plug-ins/common/file-pdf-load.c | 6 +- plug-ins/common/file-pix.c | 6 +- plug-ins/common/file-png.c | 6 +- plug-ins/common/file-pnm.c | 6 +- plug-ins/common/file-ps.c | 6 +- plug-ins/common/file-psp.c | 6 +- plug-ins/common/file-qoi.c | 6 +- plug-ins/common/file-raw-data.c | 8 +- plug-ins/common/file-sunras.c | 6 +- plug-ins/common/file-svg.c | 6 +- plug-ins/common/file-tga.c | 6 +- plug-ins/common/file-wbmp.c | 6 +- plug-ins/common/file-wmf.c | 6 +- plug-ins/common/file-xbm.c | 6 +- plug-ins/common/file-xmc.c | 6 +- plug-ins/common/file-xpm.c | 6 +- plug-ins/common/file-xwd.c | 6 +- plug-ins/file-bmp/bmp.c | 6 +- plug-ins/file-dds/dds.c | 6 +- plug-ins/file-exr/file-exr.c | 6 +- plug-ins/file-faxg3/faxg3.c | 6 +- plug-ins/file-fits/fits.c | 6 +- plug-ins/file-fli/fli-gimp.c | 6 +- plug-ins/file-icns/file-icns.c | 6 +- plug-ins/file-ico/ico.c | 6 +- plug-ins/file-jpeg/jpeg.c | 2 +- plug-ins/file-psd/psd.c | 18 +- plug-ins/file-raw/file-darktable.c | 8 +- plug-ins/file-raw/file-raw-placeholder.c | 8 +- plug-ins/file-raw/file-rawtherapee.c | 8 +- plug-ins/file-sgi/sgi.c | 6 +- plug-ins/file-tiff/file-tiff.c | 6 +- plug-ins/file-webp/file-webp.c | 6 +- 48 files changed, 258 insertions(+), 336 deletions(-) diff --git a/libgimp/gimp.def b/libgimp/gimp.def index cc2279c440..976df353b8 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -619,7 +619,6 @@ EXPORTS gimp_load_procedure_get_thumbnail_loader gimp_load_procedure_get_type gimp_load_procedure_new - gimp_load_procedure_new2 gimp_load_procedure_set_handles_raw gimp_load_procedure_set_thumbnail_loader gimp_main diff --git a/libgimp/gimploadprocedure.c b/libgimp/gimploadprocedure.c index 7b49dda525..3dae306ada 100644 --- a/libgimp/gimploadprocedure.c +++ b/libgimp/gimploadprocedure.c @@ -55,7 +55,6 @@ struct _GimpLoadProcedurePrivate { GimpRunLoadFunc run_func; - GimpRunLoadFunc2 run_func2; gpointer run_data; GDestroyNotify run_data_destroy; @@ -177,12 +176,18 @@ static GimpValueArray * gimp_load_procedure_run (GimpProcedure *procedure, const GimpValueArray *args) { - GimpLoadProcedure *load_proc = GIMP_LOAD_PROCEDURE (procedure); - GimpValueArray *remaining; - GimpValueArray *return_values; - GimpRunMode run_mode; - GFile *file; - gint i; + GimpLoadProcedure *load_proc = GIMP_LOAD_PROCEDURE (procedure); + GimpValueArray *remaining; + GimpValueArray *return_values; + GimpProcedureConfig *config; + GimpImage *image = NULL; + GimpMetadata *metadata = NULL; + gchar *mimetype = NULL; + GimpMetadataLoadFlags flags = GIMP_METADATA_LOAD_ALL; + GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; + GimpRunMode run_mode; + GFile *file; + gint i; run_mode = GIMP_VALUES_GET_ENUM (args, 0); file = GIMP_VALUES_GET_FILE (args, 1); @@ -196,103 +201,85 @@ gimp_load_procedure_run (GimpProcedure *procedure, gimp_value_array_append (remaining, value); } - if (load_proc->priv->run_func2) + config = gimp_procedure_create_config (procedure); + mimetype = (gchar *) gimp_file_procedure_get_mime_types (GIMP_FILE_PROCEDURE (procedure)); + + if (mimetype != NULL) { - GimpProcedureConfig *config; - GimpImage *image = NULL; - GimpMetadata *metadata = NULL; - gchar *mimetype = NULL; - GimpMetadataLoadFlags flags = GIMP_METADATA_LOAD_ALL; - GimpPDBStatusType status = GIMP_PDB_EXECUTION_ERROR; + char *delim; - config = gimp_procedure_create_config (procedure); - mimetype = (gchar *) gimp_file_procedure_get_mime_types (GIMP_FILE_PROCEDURE (procedure)); - - if (mimetype != NULL) - { - char *delim; - - mimetype = g_strdup (mimetype); - mimetype = g_strstrip (mimetype); - delim = strstr (mimetype, ","); - if (delim) - *delim = '\0'; - /* Though docs only writes about the list being comma-separated, our - * code apparently also split by spaces. - */ - delim = strstr (mimetype, " "); - if (delim) - *delim = '\0'; - delim = strstr (mimetype, "\t"); - if (delim) - *delim = '\0'; - - metadata = gimp_metadata_load_from_file (file, NULL); - g_free (mimetype); - } - else - { - flags = GIMP_METADATA_LOAD_NONE; - } - - if (metadata == NULL) - metadata = gimp_metadata_new (); - - return_values = load_proc->priv->run_func2 (procedure, - run_mode, - file, - metadata, &flags, - config, - load_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); - - gimp_procedure_config_end_run (config, status); - - if (status == GIMP_PDB_SUCCESS) - { - if (gimp_value_array_length (return_values) < 2 || - ! GIMP_VALUE_HOLDS_IMAGE (gimp_value_array_index (return_values, 1))) - { - GError *error = NULL; - - status = GIMP_PDB_EXECUTION_ERROR; - g_set_error (&error, GIMP_PLUG_IN_ERROR, 0, - _("This file loading plug-in returned SUCCESS as a status without an image. " - "This is a bug in the plug-in code. Contact the plug-in developer.")); - gimp_value_array_unref (return_values); - return_values = gimp_procedure_new_return_values (procedure, status, error); - } - else - { - image = GIMP_VALUES_GET_IMAGE (return_values, 1); - } - } - - if (image != NULL && metadata != NULL && flags != GIMP_METADATA_LOAD_NONE) - gimp_image_metadata_load_finish (image, NULL, metadata, flags); - - /* This is debug printing to help plug-in developers figure out best - * practices. + mimetype = g_strdup (mimetype); + mimetype = g_strstrip (mimetype); + delim = strstr (mimetype, ","); + if (delim) + *delim = '\0'; + /* Though docs only writes about the list being comma-separated, our + * code apparently also split by spaces. */ - if (G_OBJECT (config)->ref_count > 1) - g_printerr ("%s: ERROR: the GimpSaveProcedureConfig object was refed " - "by plug-in, it MUST NOT do that!\n", G_STRFUNC); + delim = strstr (mimetype, " "); + if (delim) + *delim = '\0'; + delim = strstr (mimetype, "\t"); + if (delim) + *delim = '\0'; - g_object_unref (config); + metadata = gimp_metadata_load_from_file (file, NULL); + g_free (mimetype); } else { - return_values = load_proc->priv->run_func (procedure, - run_mode, - file, - remaining, - load_proc->priv->run_data); + flags = GIMP_METADATA_LOAD_NONE; } + if (metadata == NULL) + metadata = gimp_metadata_new (); + + return_values = load_proc->priv->run_func (procedure, + run_mode, + file, + metadata, &flags, + config, + load_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); + + gimp_procedure_config_end_run (config, status); + + if (status == GIMP_PDB_SUCCESS) + { + if (gimp_value_array_length (return_values) < 2 || + ! GIMP_VALUE_HOLDS_IMAGE (gimp_value_array_index (return_values, 1))) + { + GError *error = NULL; + + status = GIMP_PDB_EXECUTION_ERROR; + g_set_error (&error, GIMP_PLUG_IN_ERROR, 0, + _("This file loading plug-in returned SUCCESS as a status without an image. " + "This is a bug in the plug-in code. Contact the plug-in developer.")); + gimp_value_array_unref (return_values); + return_values = gimp_procedure_new_return_values (procedure, status, error); + } + else + { + image = GIMP_VALUES_GET_IMAGE (return_values, 1); + } + } + + if (image != NULL && metadata != NULL && flags != GIMP_METADATA_LOAD_NONE) + gimp_image_metadata_load_finish (image, NULL, metadata, flags); + + /* 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 GimpSaveProcedureConfig object was refed " + "by plug-in, it MUST NOT do that!\n", G_STRFUNC); + + g_object_unref (config); + g_clear_object (&metadata); gimp_value_array_unref (remaining); return return_values; @@ -369,53 +356,6 @@ gimp_load_procedure_new (GimpPlugIn *plug_in, return GIMP_PROCEDURE (procedure); } -/** - * gimp_load_procedure_new2: - * @plug_in: a #GimpPlugIn. - * @name: the new procedure's name. - * @proc_type: the new procedure's #GimpPDBProcType. - * @run_func: the run function for the new procedure. - * @run_data: user data passed to @run_func. - * @run_data_destroy: (nullable): free function for @run_data, or %NULL. - * - * Creates a new load procedure named @name which will call @run_func - * when invoked. - * - * See gimp_procedure_new() for information about @proc_type. - * - * Returns: (transfer full): a new #GimpProcedure. - * - * Since: 3.0 - **/ -GimpProcedure * -gimp_load_procedure_new2 (GimpPlugIn *plug_in, - const gchar *name, - GimpPDBProcType proc_type, - GimpRunLoadFunc2 run_func, - gpointer run_data, - GDestroyNotify run_data_destroy) -{ - GimpLoadProcedure *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_LOAD_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); -} - /** * gimp_load_procedure_set_handles_raw: * @procedure: A load procedure object. diff --git a/libgimp/gimploadprocedure.h b/libgimp/gimploadprocedure.h index d3e70d75e3..2a6953a255 100644 --- a/libgimp/gimploadprocedure.h +++ b/libgimp/gimploadprocedure.h @@ -31,47 +31,36 @@ G_BEGIN_DECLS /** * GimpRunLoadFunc: - * @procedure: the #GimpProcedure that runs. - * @run_mode: the #GimpRunMode. - * @file: the #GFile to load from. - * @args: the @procedure's remaining arguments. - * @run_data: (closure): the run_data given in gimp_load_procedure_new(). - * - * The load function is run during the lifetime of the GIMP session, - * each time a plug-in load procedure is called. - * - * Returns: (transfer full): the @procedure's return values. - * - * Since: 3.0 - **/ -typedef GimpValueArray * (* GimpRunLoadFunc) (GimpProcedure *procedure, - GimpRunMode run_mode, - GFile *file, - const GimpValueArray *args, - gpointer run_data); - -/** - * GimpRunLoadFunc2: - * @procedure: the #GimpProcedure that runs. - * @run_mode: the #GimpRunMode. - * @file: the #GFile to load from. + * @procedure: the [class@Gimp.Procedure] that runs. + * @run_mode: the [enum@RunMode]. + * @file: the [iface@Gio.File] to load from. + * @metadata: the [class@Gimp.Metadata] which will be added to the new image. + * @flags: (inout): flags to filter which metadata will be added.. * @config: the @procedure's remaining arguments. * @run_data: (closure): the run_data given in gimp_load_procedure_new(). * - * The load function is run during the lifetime of the GIMP session, - * each time a plug-in load procedure is called. + * The load function is run during the lifetime of the GIMP session, each time a + * plug-in load procedure is called. + * + * You are expected to read @file and create a [class@Gimp.Image] out of its + * data. This image will be the first return value. + * @metadata will be filled from metadata from @file if our infrastructure + * supports this format. You may tweak this object, for instance adding metadata + * specific to the format. You can also edit @flags if you need to filter out + * some specific common fields. For instance, it is customary to remove a + * colorspace field with [flags@MetadataLoadFlags] when a profile was added. * * Returns: (transfer full): the @procedure's return values. * * Since: 3.0 **/ -typedef GimpValueArray * (* GimpRunLoadFunc2) (GimpProcedure *procedure, - GimpRunMode run_mode, - GFile *file, - GimpMetadata *metadata, - GimpMetadataLoadFlags *flags, - GimpProcedureConfig *config, - gpointer run_data); +typedef GimpValueArray * (* GimpRunLoadFunc) (GimpProcedure *procedure, + GimpRunMode run_mode, + GFile *file, + GimpMetadata *metadata, + GimpMetadataLoadFlags *flags, + GimpProcedureConfig *config, + gpointer run_data); #define GIMP_TYPE_LOAD_PROCEDURE (gimp_load_procedure_get_type ()) @@ -107,12 +96,6 @@ GimpProcedure * gimp_load_procedure_new (GimpPlugIn *plu GimpRunLoadFunc run_func, gpointer run_data, GDestroyNotify run_data_destroy); -GimpProcedure * gimp_load_procedure_new2 (GimpPlugIn *plug_in, - const gchar *name, - GimpPDBProcType proc_type, - GimpRunLoadFunc2 run_func, - gpointer run_data, - GDestroyNotify run_data_destroy); void gimp_load_procedure_set_handles_raw (GimpLoadProcedure *procedure, gboolean handles_raw); diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c index a23fe2d4d5..31ddffb426 100644 --- a/plug-ins/common/file-cel.c +++ b/plug-ins/common/file-cel.c @@ -134,9 +134,9 @@ cel_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - cel_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + cel_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("KISS CEL")); diff --git a/plug-ins/common/file-compressor.c b/plug-ins/common/file-compressor.c index 423caa4d91..64a4b4214a 100644 --- a/plug-ins/common/file-compressor.c +++ b/plug-ins/common/file-compressor.c @@ -316,10 +316,10 @@ compressor_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, compressor->load_proc)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - compressor_load, - (gpointer) compressor, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + compressor_load, + (gpointer) compressor, NULL); gimp_procedure_set_documentation (procedure, compressor->load_blurb, diff --git a/plug-ins/common/file-desktop-link.c b/plug-ins/common/file-desktop-link.c index 2a67c92bdb..b5df00d249 100644 --- a/plug-ins/common/file-desktop-link.c +++ b/plug-ins/common/file-desktop-link.c @@ -107,9 +107,9 @@ desktop_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - desktop_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + desktop_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Desktop Link")); diff --git a/plug-ins/common/file-dicom.c b/plug-ins/common/file-dicom.c index d4175fb3fa..24fdbfbff7 100644 --- a/plug-ins/common/file-dicom.c +++ b/plug-ins/common/file-dicom.c @@ -169,9 +169,9 @@ dicom_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dicom_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dicom_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("DICOM image")); diff --git a/plug-ins/common/file-farbfeld.c b/plug-ins/common/file-farbfeld.c index 95f8214cd6..36b488c0f4 100644 --- a/plug-ins/common/file-farbfeld.c +++ b/plug-ins/common/file-farbfeld.c @@ -130,9 +130,9 @@ farbfeld_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - farbfeld_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + farbfeld_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, N_("Farbfeld")); diff --git a/plug-ins/common/file-gegl.c b/plug-ins/common/file-gegl.c index bc927331c6..496ed16b55 100644 --- a/plug-ins/common/file-gegl.c +++ b/plug-ins/common/file-gegl.c @@ -194,10 +194,10 @@ goat_create_procedure (GimpPlugIn *plug_in, if (! g_strcmp0 (name, format->load_proc)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - goat_load, - (gpointer) format, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + goat_load, + (gpointer) format, NULL); gimp_procedure_set_menu_label (procedure, format->file_type); diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c index 0bc1b96674..0e599dd619 100644 --- a/plug-ins/common/file-gif-load.c +++ b/plug-ins/common/file-gif-load.c @@ -171,9 +171,9 @@ gif_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - gif_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + gif_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("GIF image")); diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c index e8636a560a..cdf8cdfcfe 100644 --- a/plug-ins/common/file-heif.c +++ b/plug-ins/common/file-heif.c @@ -187,9 +187,9 @@ heif_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - heif_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + heif_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("HEIF/HEIC")); @@ -305,9 +305,9 @@ heif_create_procedure (GimpPlugIn *plug_in, #if LIBHEIF_HAVE_VERSION(1,8,0) else if (! strcmp (name, LOAD_PROC_AV1)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - heif_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + heif_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, "HEIF/AVIF"); diff --git a/plug-ins/common/file-iff.c b/plug-ins/common/file-iff.c index 33f7750114..05a8023e8f 100644 --- a/plug-ins/common/file-iff.c +++ b/plug-ins/common/file-iff.c @@ -140,9 +140,9 @@ iff_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - iff_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + iff_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Amiga IFF")); diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c index 4643ec5c0d..3c3fbc1053 100644 --- a/plug-ins/common/file-jp2-load.c +++ b/plug-ins/common/file-jp2-load.c @@ -182,9 +182,9 @@ jp2_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_JP2_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - jp2_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + jp2_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("JPEG 2000 image")); gimp_file_procedure_set_format_name (GIMP_FILE_PROCEDURE (procedure), @@ -216,9 +216,9 @@ jp2_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_J2K_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - jp2_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + jp2_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("JPEG 2000 codestream")); gimp_file_procedure_set_format_name (GIMP_FILE_PROCEDURE (procedure), diff --git a/plug-ins/common/file-jpegxl.c b/plug-ins/common/file-jpegxl.c index cde089b716..240eed0716 100644 --- a/plug-ins/common/file-jpegxl.c +++ b/plug-ins/common/file-jpegxl.c @@ -135,9 +135,9 @@ jpegxl_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - jpegxl_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + jpegxl_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("JPEG XL image")); diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c index 5b8a85bac1..885fafefa3 100644 --- a/plug-ins/common/file-pcx.c +++ b/plug-ins/common/file-pcx.c @@ -205,9 +205,9 @@ pcx_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - pcx_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + pcx_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("ZSoft PCX image")); @@ -236,9 +236,9 @@ pcx_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_PROC_DCX)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dcx_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dcx_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("ZSoft DCX image")); diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c index ab4d8030a9..9c814f753c 100644 --- a/plug-ins/common/file-pdf-load.c +++ b/plug-ins/common/file-pdf-load.c @@ -312,9 +312,9 @@ pdf_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - pdf_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + pdf_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Portable Document Format")); diff --git a/plug-ins/common/file-pix.c b/plug-ins/common/file-pix.c index ffe1e7266b..6c1a5e87a0 100644 --- a/plug-ins/common/file-pix.c +++ b/plug-ins/common/file-pix.c @@ -164,9 +164,9 @@ pix_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - pix_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + pix_load, NULL, NULL); gimp_file_procedure_set_handles_remote (GIMP_FILE_PROCEDURE (procedure), TRUE); diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c index 433016cd89..c2ae6052e6 100644 --- a/plug-ins/common/file-png.c +++ b/plug-ins/common/file-png.c @@ -176,9 +176,9 @@ png_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - png_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + png_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("PNG image")); diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c index b58ad3f0aa..65a164c73e 100644 --- a/plug-ins/common/file-pnm.c +++ b/plug-ins/common/file-pnm.c @@ -311,9 +311,9 @@ pnm_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - pnm_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + pnm_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("PNM Image")); diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c index 467267a5d1..367f8fb260 100644 --- a/plug-ins/common/file-ps.c +++ b/plug-ins/common/file-ps.c @@ -330,9 +330,9 @@ ps_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PS_PROC) || ! strcmp (name, LOAD_EPS_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - ps_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + ps_load, NULL, NULL); if (! strcmp (name, LOAD_PS_PROC)) { diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c index af757a9991..cf84e4a456 100644 --- a/plug-ins/common/file-psp.c +++ b/plug-ins/common/file-psp.c @@ -660,9 +660,9 @@ psp_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - psp_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + psp_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Paint Shop Pro image")); diff --git a/plug-ins/common/file-qoi.c b/plug-ins/common/file-qoi.c index 107a3ea4cb..dc620a6848 100644 --- a/plug-ins/common/file-qoi.c +++ b/plug-ins/common/file-qoi.c @@ -132,9 +132,9 @@ qoi_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - qoi_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + qoi_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, N_("Quite OK Image")); diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c index 091d4d8502..244168034e 100644 --- a/plug-ins/common/file-raw-data.c +++ b/plug-ins/common/file-raw-data.c @@ -329,9 +329,9 @@ raw_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - raw_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + raw_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Raw image data")); @@ -409,7 +409,7 @@ raw_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_HGT_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, + procedure = gimp_load_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, raw_load, NULL, NULL); diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c index c32565a405..b12cbcba1e 100644 --- a/plug-ins/common/file-sunras.c +++ b/plug-ins/common/file-sunras.c @@ -270,9 +270,9 @@ sunras_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - sunras_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + sunras_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("SUN Rasterfile image")); diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c index 68740ee41e..f4e5cee499 100644 --- a/plug-ins/common/file-svg.c +++ b/plug-ins/common/file-svg.c @@ -153,9 +153,9 @@ svg_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - svg_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + svg_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("SVG image")); diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c index 491c9d1184..4954a000ef 100644 --- a/plug-ins/common/file-tga.c +++ b/plug-ins/common/file-tga.c @@ -256,9 +256,9 @@ tga_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - tga_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + tga_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("TarGA image")); diff --git a/plug-ins/common/file-wbmp.c b/plug-ins/common/file-wbmp.c index fead8b6963..fcd471e116 100644 --- a/plug-ins/common/file-wbmp.c +++ b/plug-ins/common/file-wbmp.c @@ -111,9 +111,9 @@ wbmp_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - wbmp_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + wbmp_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Wireless BMP image")); diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c index c3232d18a3..14c931bdae 100644 --- a/plug-ins/common/file-wmf.c +++ b/plug-ins/common/file-wmf.c @@ -148,9 +148,9 @@ wmf_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - wmf_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + wmf_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Microsoft WMF file")); diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c index e988f0bca8..f2d025a7bc 100644 --- a/plug-ins/common/file-xbm.c +++ b/plug-ins/common/file-xbm.c @@ -155,9 +155,9 @@ xbm_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - xbm_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + xbm_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("X BitMap image")); diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c index 8a9b01dfb1..85cc6873fb 100644 --- a/plug-ins/common/file-xmc.c +++ b/plug-ins/common/file-xmc.c @@ -294,9 +294,9 @@ xmc_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - xmc_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + xmc_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("X11 Mouse Cursor")); diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c index 32a1f8af23..763c10cb4f 100644 --- a/plug-ins/common/file-xpm.c +++ b/plug-ins/common/file-xpm.c @@ -192,9 +192,9 @@ xpm_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - xpm_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + xpm_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("X PixMap image")); diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c index 5ed9e083c1..fb3988dbc1 100644 --- a/plug-ins/common/file-xwd.c +++ b/plug-ins/common/file-xwd.c @@ -320,9 +320,9 @@ xwd_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - xwd_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + xwd_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("X window dump")); diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c index 16546d73c4..432cf4ccfc 100644 --- a/plug-ins/file-bmp/bmp.c +++ b/plug-ins/file-bmp/bmp.c @@ -148,9 +148,9 @@ bmp_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - bmp_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + bmp_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Windows BMP image")); diff --git a/plug-ins/file-dds/dds.c b/plug-ins/file-dds/dds.c index a59365f77a..68ca756c51 100644 --- a/plug-ins/file-dds/dds.c +++ b/plug-ins/file-dds/dds.c @@ -142,9 +142,9 @@ dds_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - dds_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + dds_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("DDS image")); diff --git a/plug-ins/file-exr/file-exr.c b/plug-ins/file-exr/file-exr.c index 60b69036d9..7bdd9041fe 100644 --- a/plug-ins/file-exr/file-exr.c +++ b/plug-ins/file-exr/file-exr.c @@ -102,9 +102,9 @@ exr_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - exr_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + exr_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("OpenEXR image")); diff --git a/plug-ins/file-faxg3/faxg3.c b/plug-ins/file-faxg3/faxg3.c index 36bf95e940..2742bcddf8 100644 --- a/plug-ins/file-faxg3/faxg3.c +++ b/plug-ins/file-faxg3/faxg3.c @@ -129,9 +129,9 @@ faxg3_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - faxg3_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + faxg3_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("G3 fax image")); diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c index 3772af7698..f5d006ba0e 100644 --- a/plug-ins/file-fits/fits.c +++ b/plug-ins/file-fits/fits.c @@ -172,9 +172,9 @@ fits_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - fits_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + fits_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Flexible Image Transport System")); diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c index aa65f86002..adf95a8ee1 100644 --- a/plug-ins/file-fli/fli-gimp.c +++ b/plug-ins/file-fli/fli-gimp.c @@ -177,9 +177,9 @@ fli_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - fli_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + fli_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("AutoDesk FLIC animation")); diff --git a/plug-ins/file-icns/file-icns.c b/plug-ins/file-icns/file-icns.c index 8ac329009a..5715de1624 100644 --- a/plug-ins/file-icns/file-icns.c +++ b/plug-ins/file-icns/file-icns.c @@ -127,9 +127,9 @@ icns_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - icns_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + icns_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, N_("Icns")); diff --git a/plug-ins/file-ico/ico.c b/plug-ins/file-ico/ico.c index c06e7a3251..102bd98fc5 100644 --- a/plug-ins/file-ico/ico.c +++ b/plug-ins/file-ico/ico.c @@ -168,7 +168,7 @@ ico_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, + procedure = gimp_load_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, ico_load, NULL, NULL); @@ -196,7 +196,7 @@ ico_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_CUR_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, + procedure = gimp_load_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, ico_load, NULL, NULL); @@ -226,7 +226,7 @@ ico_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_ANI_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, + procedure = gimp_load_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, ani_load, NULL, NULL); diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c index 0faa1a3cb6..6a90b4437a 100644 --- a/plug-ins/file-jpeg/jpeg.c +++ b/plug-ins/file-jpeg/jpeg.c @@ -129,7 +129,7 @@ jpeg_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, + procedure = gimp_load_procedure_new (plug_in, name, GIMP_PDB_PROC_TYPE_PLUGIN, jpeg_load, NULL, NULL); diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c index 2a6f166ed3..ee0d56e21d 100644 --- a/plug-ins/file-psd/psd.c +++ b/plug-ins/file-psd/psd.c @@ -129,9 +129,9 @@ psd_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - psd_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + psd_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Photoshop image")); @@ -158,9 +158,9 @@ psd_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_MERGED_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - psd_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + psd_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Photoshop image (merged)")); @@ -271,9 +271,9 @@ psd_create_procedure (GimpPlugIn *plug_in, } else if (! strcmp (name, LOAD_METADATA_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - psd_load_metadata, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + psd_load_metadata, NULL, NULL); gimp_procedure_set_documentation (procedure, "Loads Photoshop-format metadata " diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c index 4403d6ef76..31fa4dc861 100644 --- a/plug-ins/file-raw/file-darktable.c +++ b/plug-ins/file-raw/file-darktable.c @@ -268,10 +268,10 @@ darktable_create_procedure (GimpPlugIn *plug_in, load_blurb = g_strdup_printf (format->load_blurb_format, "darktable"); load_help = g_strdup_printf (format->load_help_format, "darktable"); - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - darktable_load, - (gpointer) format, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + darktable_load, + (gpointer) format, NULL); gimp_procedure_set_documentation (procedure, load_blurb, load_help, name); diff --git a/plug-ins/file-raw/file-raw-placeholder.c b/plug-ins/file-raw/file-raw-placeholder.c index 65781d064c..51dbf75653 100644 --- a/plug-ins/file-raw/file-raw-placeholder.c +++ b/plug-ins/file-raw/file-raw-placeholder.c @@ -128,10 +128,10 @@ placeholder_create_procedure (GimpPlugIn *plug_in, load_blurb = g_strdup_printf (format->load_blurb_format, "placeholder"); load_help = g_strdup_printf (format->load_help_format, "placeholder"); - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - placeholder_load, - (gpointer) format, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + placeholder_load, + (gpointer) format, NULL); gimp_procedure_set_documentation (procedure, load_blurb, load_help, name); diff --git a/plug-ins/file-raw/file-rawtherapee.c b/plug-ins/file-raw/file-rawtherapee.c index 231205c2ec..a339f93878 100644 --- a/plug-ins/file-raw/file-rawtherapee.c +++ b/plug-ins/file-raw/file-rawtherapee.c @@ -219,10 +219,10 @@ rawtherapee_create_procedure (GimpPlugIn *plug_in, load_blurb = g_strdup_printf (format->load_blurb_format, "rawtherapee"); load_help = g_strdup_printf (format->load_help_format, "rawtherapee"); - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - rawtherapee_load, - (gpointer) format, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + rawtherapee_load, + (gpointer) format, NULL); gimp_procedure_set_documentation (procedure, load_blurb, load_help, name); diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c index 13467c9289..0cba3cf040 100644 --- a/plug-ins/file-sgi/sgi.c +++ b/plug-ins/file-sgi/sgi.c @@ -139,9 +139,9 @@ sgi_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - sgi_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + sgi_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, N_("Silicon Graphics IRIS image")); diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c index 3a42657cc7..ed328849ad 100644 --- a/plug-ins/file-tiff/file-tiff.c +++ b/plug-ins/file-tiff/file-tiff.c @@ -155,9 +155,9 @@ tiff_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - tiff_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + tiff_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("TIFF or BigTIFF image")); diff --git a/plug-ins/file-webp/file-webp.c b/plug-ins/file-webp/file-webp.c index f7fd7d27de..2bd48a17e6 100644 --- a/plug-ins/file-webp/file-webp.c +++ b/plug-ins/file-webp/file-webp.c @@ -117,9 +117,9 @@ webp_create_procedure (GimpPlugIn *plug_in, if (! strcmp (name, LOAD_PROC)) { - procedure = gimp_load_procedure_new2 (plug_in, name, - GIMP_PDB_PROC_TYPE_PLUGIN, - webp_load, NULL, NULL); + procedure = gimp_load_procedure_new (plug_in, name, + GIMP_PDB_PROC_TYPE_PLUGIN, + webp_load, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("WebP image"));