[gimp] Properly prefix the values of enum GimpPDBProcType



commit 8a78203aed1a67a05c1e334bdda85e7343520883
Author: Michael Natterer <mitch gimp org>
Date:   Fri Aug 30 12:52:28 2019 +0200

    Properly prefix the values of enum GimpPDBProcType
    
    to be GIMP_PDB_PROC_TYPE_PLUGIN, _EXTENSION etc.

 app/actions/plug-in-commands.c                 |  8 ++---
 app/file-data/file-data.c                      | 28 +++++++++---------
 app/file/file-save.c                           |  2 +-
 app/pdb/gimpprocedure.c                        |  2 +-
 app/pdb/pdb-cmds.c                             |  2 +-
 app/plug-in/gimpplugin-message.c               | 12 ++++----
 app/plug-in/gimpplugin.c                       |  8 ++---
 app/plug-in/gimppluginmanager-call.c           |  2 +-
 app/plug-in/gimppluginmanager-restore.c        |  4 +--
 app/plug-in/gimppluginprocedure.c              |  8 ++---
 app/plug-in/gimptemporaryprocedure.c           |  2 +-
 app/plug-in/plug-in-rc.c                       |  4 +--
 app/xcf/xcf.c                                  |  8 ++---
 libgimp/gimpbrushselect.c                      |  2 +-
 libgimp/gimpfontselect.c                       |  2 +-
 libgimp/gimpgradientselect.c                   |  2 +-
 libgimp/gimpimageprocedure.c                   |  3 +-
 libgimp/gimplegacy.c                           | 31 +++++++++----------
 libgimp/gimplegacy.h                           |  5 ++++
 libgimp/gimploadprocedure.c                    |  3 +-
 libgimp/gimppaletteselect.c                    |  2 +-
 libgimp/gimppatternselect.c                    |  2 +-
 libgimp/gimpplugin.c                           | 19 ++++++------
 libgimp/gimpprocedure.c                        | 41 ++++++++++++++------------
 libgimp/gimpprogress.c                         |  2 +-
 libgimp/gimpsaveprocedure.c                    |  3 +-
 libgimp/gimpthumbnailprocedure.c               |  3 +-
 libgimpbase/gimpbaseenums.c                    | 16 +++++-----
 libgimpbase/gimpbaseenums.h                    | 16 +++++-----
 pdb/enums.pl                                   | 14 +++++----
 plug-ins/common/align-layers.c                 |  3 +-
 plug-ins/common/animation-play.c               |  3 +-
 plug-ins/common/blinds.c                       |  2 +-
 plug-ins/common/border-average.c               |  3 +-
 plug-ins/common/busy-dialog.c                  | 16 ++++++----
 plug-ins/common/checkerboard.c                 |  2 +-
 plug-ins/common/colormap-remap.c               |  6 ++--
 plug-ins/common/compose.c                      |  9 ++++--
 plug-ins/common/contrast-retinex.c             |  2 +-
 plug-ins/common/decompose.c                    |  3 +-
 plug-ins/common/despeckle.c                    |  2 +-
 plug-ins/common/destripe.c                     |  2 +-
 plug-ins/common/file-aa.c                      |  3 +-
 plug-ins/common/file-cel.c                     |  6 ++--
 plug-ins/common/file-compressor.c              |  6 ++--
 plug-ins/common/file-csource.c                 |  3 +-
 plug-ins/common/file-desktop-link.c            |  3 +-
 plug-ins/common/file-dicom.c                   |  6 ++--
 plug-ins/common/file-gbr.c                     |  3 +-
 plug-ins/common/file-gegl.c                    |  6 ++--
 plug-ins/common/file-gif-load.c                |  6 ++--
 plug-ins/common/file-gif-save.c                |  3 +-
 plug-ins/common/file-gih.c                     |  3 +-
 plug-ins/common/file-glob.c                    |  3 +-
 plug-ins/common/file-header.c                  |  3 +-
 plug-ins/common/file-heif.c                    |  6 ++--
 plug-ins/common/file-html-table.c              |  3 +-
 plug-ins/common/file-jp2-load.c                |  6 ++--
 plug-ins/common/file-mng.c                     |  3 +-
 plug-ins/common/file-pat.c                     |  3 +-
 plug-ins/common/file-pcx.c                     |  6 ++--
 plug-ins/common/file-pdf-load.c                |  6 ++--
 plug-ins/common/file-pdf-save.c                |  6 ++--
 plug-ins/common/file-pix.c                     |  6 ++--
 plug-ins/common/file-png.c                     |  6 ++--
 plug-ins/common/file-pnm.c                     | 18 +++++++----
 plug-ins/common/file-ps.c                      |  9 ++++--
 plug-ins/common/file-psp.c                     |  6 ++--
 plug-ins/common/file-raw-data.c                | 12 +++++---
 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-wmf.c                     |  6 ++--
 plug-ins/common/file-xbm.c                     |  6 ++--
 plug-ins/common/file-xmc.c                     |  9 ++++--
 plug-ins/common/file-xpm.c                     |  6 ++--
 plug-ins/common/file-xwd.c                     |  6 ++--
 plug-ins/common/film.c                         |  3 +-
 plug-ins/common/gradient-map.c                 |  6 ++--
 plug-ins/common/grid.c                         |  2 +-
 plug-ins/common/guillotine.c                   | 13 ++++----
 plug-ins/common/jigsaw.c                       |  2 +-
 plug-ins/common/mail.c                         |  3 +-
 plug-ins/common/nl-filter.c                    |  2 +-
 plug-ins/common/plugin-browser.c               |  3 +-
 plug-ins/common/procedure-browser.c            |  3 +-
 plug-ins/common/sparkle.c                      |  2 +-
 plug-ins/common/unit-editor.c                  |  3 +-
 plug-ins/common/wavelet-decompose.c            |  3 +-
 plug-ins/common/web-browser.c                  |  3 +-
 plug-ins/common/web-page.c                     |  3 +-
 plug-ins/file-bmp/bmp.c                        |  6 ++--
 plug-ins/file-dds/dds.c                        | 15 ++++++----
 plug-ins/file-exr/file-exr.c                   |  3 +-
 plug-ins/file-faxg3/faxg3.c                    |  3 +-
 plug-ins/file-fits/fits.c                      |  6 ++--
 plug-ins/file-fli/fli-gimp.c                   |  9 ++++--
 plug-ins/file-ico/ico.c                        |  9 ++++--
 plug-ins/file-jpeg/jpeg.c                      |  9 ++++--
 plug-ins/file-psd/psd.c                        | 12 +++++---
 plug-ins/file-raw/file-darktable.c             |  6 ++--
 plug-ins/file-raw/file-raw-placeholder.c       |  3 +-
 plug-ins/file-raw/file-rawtherapee.c           |  6 ++--
 plug-ins/file-sgi/sgi.c                        |  6 ++--
 plug-ins/file-tiff/file-tiff.c                 |  6 ++--
 plug-ins/file-webp/file-webp.c                 |  6 ++--
 plug-ins/flame/flame.c                         |  2 +-
 plug-ins/fractal-explorer/fractal-explorer.c   |  3 +-
 plug-ins/gfig/gfig.c                           |  3 +-
 plug-ins/gimpressionist/gimp.c                 |  2 +-
 plug-ins/goat-exercises/goat-exercise-c.c      |  3 +-
 plug-ins/help-browser/help-browser.c           |  5 ++--
 plug-ins/help/help.c                           |  6 ++--
 plug-ins/ifs-compose/ifs-compose.c             |  3 +-
 plug-ins/imagemap/imap_main.c                  |  3 +-
 plug-ins/metadata/metadata-editor.c            |  3 +-
 plug-ins/metadata/metadata-viewer.c            |  3 +-
 plug-ins/pagecurl/pagecurl.c                   |  3 +-
 plug-ins/print/print.c                         |  9 ++++--
 plug-ins/screenshot/screenshot.c               |  3 +-
 plug-ins/script-fu/script-fu-script.c          |  2 +-
 plug-ins/script-fu/script-fu.c                 | 17 +++++++----
 plug-ins/selection-to-path/selection-to-path.c |  3 +-
 123 files changed, 452 insertions(+), 287 deletions(-)
---
diff --git a/app/actions/plug-in-commands.c b/app/actions/plug-in-commands.c
index 295a68bd41..edba3a9328 100644
--- a/app/actions/plug-in-commands.c
+++ b/app/actions/plug-in-commands.c
@@ -84,12 +84,12 @@ plug_in_run_cmd_callback (GimpAction *action,
 
   switch (procedure->proc_type)
     {
-    case GIMP_EXTENSION:
+    case GIMP_PDB_PROC_TYPE_EXTENSION:
       args = procedure_commands_get_run_mode_arg (procedure);
       break;
 
-    case GIMP_PLUGIN:
-    case GIMP_TEMPORARY:
+    case GIMP_PDB_PROC_TYPE_PLUGIN:
+    case GIMP_PDB_PROC_TYPE_TEMPORARY:
       if (GIMP_IS_DATA_FACTORY_VIEW (data) ||
           GIMP_IS_BUFFER_VIEW (data))
         {
@@ -138,7 +138,7 @@ plug_in_run_cmd_callback (GimpAction *action,
         }
       break;
 
-    case GIMP_INTERNAL:
+    case GIMP_PDB_PROC_TYPE_INTERNAL:
       g_warning ("Unhandled procedure type.");
       break;
     }
diff --git a/app/file-data/file-data.c b/app/file-data/file-data.c
index 1a3d198e45..39e5a94177 100644
--- a/app/file-data/file-data.c
+++ b/app/file-data/file-data.c
@@ -50,10 +50,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-gbr-load  */
   file = g_file_new_for_path ("file-gbr-load");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_gbr_load_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -115,10 +115,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-gbr-save-internal  */
   file = g_file_new_for_path ("file-gbr-save-internal");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_gbr_save_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -201,10 +201,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-gih-load  */
   file = g_file_new_for_path ("file-gih-load");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_gih_load_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -263,10 +263,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-gih-save-internal  */
   file = g_file_new_for_path ("file-gih-save-internal");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_gih_save_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -356,10 +356,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-pat-load  */
   file = g_file_new_for_path ("file-pat-load");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_pat_load_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -417,10 +417,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-pat-save-internal  */
   file = g_file_new_for_path ("file-pat-save-internal");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_pat_save_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -498,10 +498,10 @@ file_data_init (Gimp *gimp)
 
   /*  file-gex-load  */
   file = g_file_new_for_path ("file-gex-load");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = file_gex_load_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
diff --git a/app/file/file-save.c b/app/file/file-save.c
index 5cff69c6ee..e8b985a0c3 100644
--- a/app/file/file-save.c
+++ b/app/file/file-save.c
@@ -280,7 +280,7 @@ file_save (Gimp                *gimp,
                                                g_slist_nth_data (file_proc->mime_types_list, 0));
 
       /* only save a thumbnail if we are saving as XCF, see bug #25272 */
-      if (GIMP_PROCEDURE (file_proc)->proc_type == GIMP_INTERNAL)
+      if (GIMP_PROCEDURE (file_proc)->proc_type == GIMP_PDB_PROC_TYPE_INTERNAL)
         gimp_imagefile_save_thumbnail (imagefile,
                                        g_slist_nth_data (file_proc->mime_types_list, 0),
                                        image,
diff --git a/app/pdb/gimpprocedure.c b/app/pdb/gimpprocedure.c
index 6e977ada40..9a54d0eae7 100644
--- a/app/pdb/gimpprocedure.c
+++ b/app/pdb/gimpprocedure.c
@@ -104,7 +104,7 @@ gimp_procedure_class_init (GimpProcedureClass *klass)
 static void
 gimp_procedure_init (GimpProcedure *procedure)
 {
-  procedure->proc_type = GIMP_INTERNAL;
+  procedure->proc_type = GIMP_PDB_PROC_TYPE_INTERNAL;
 }
 
 static void
diff --git a/app/pdb/pdb-cmds.c b/app/pdb/pdb-cmds.c
index a133bb8eed..324bb91eec 100644
--- a/app/pdb/pdb-cmds.c
+++ b/app/pdb/pdb-cmds.c
@@ -684,7 +684,7 @@ register_pdb_procs (GimpPDB *pdb)
                                                       "proc type",
                                                       "The procedure type",
                                                       GIMP_TYPE_PDB_PROC_TYPE,
-                                                      GIMP_INTERNAL,
+                                                      GIMP_PDB_PROC_TYPE_INTERNAL,
                                                       GIMP_PARAM_READWRITE));
   gimp_procedure_add_return_value (procedure,
                                    g_param_spec_int ("num-args",
diff --git a/app/plug-in/gimpplugin-message.c b/app/plug-in/gimpplugin-message.c
index 2b7232ac35..c367230221 100644
--- a/app/plug-in/gimpplugin-message.c
+++ b/app/plug-in/gimpplugin-message.c
@@ -840,13 +840,13 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
 
   switch (proc_install->type)
     {
-    case GIMP_PLUGIN:
-    case GIMP_EXTENSION:
+    case GIMP_PDB_PROC_TYPE_PLUGIN:
+    case GIMP_PDB_PROC_TYPE_EXTENSION:
       procedure = gimp_plug_in_procedure_new (proc_install->type,
                                               plug_in->file);
       break;
 
-    case GIMP_TEMPORARY:
+    case GIMP_PDB_PROC_TYPE_TEMPORARY:
       procedure = gimp_temporary_procedure_new (plug_in);
       break;
     }
@@ -918,12 +918,12 @@ gimp_plug_in_handle_proc_install (GimpPlugIn    *plug_in,
 
   switch (proc_install->type)
     {
-    case GIMP_PLUGIN:
-    case GIMP_EXTENSION:
+    case GIMP_PDB_PROC_TYPE_PLUGIN:
+    case GIMP_PDB_PROC_TYPE_EXTENSION:
       gimp_plug_in_def_add_procedure (plug_in->plug_in_def, proc);
       break;
 
-    case GIMP_TEMPORARY:
+    case GIMP_PDB_PROC_TYPE_TEMPORARY:
       gimp_plug_in_add_temp_proc (plug_in, GIMP_TEMPORARY_PROCEDURE (proc));
       break;
     }
diff --git a/app/plug-in/gimpplugin.c b/app/plug-in/gimpplugin.c
index 908e6a69d5..d1d4f2d9ea 100644
--- a/app/plug-in/gimpplugin.c
+++ b/app/plug-in/gimpplugin.c
@@ -911,16 +911,16 @@ gimp_plug_in_menu_register (GimpPlugIn  *plug_in,
 
   switch (GIMP_PROCEDURE (proc)->proc_type)
     {
-    case GIMP_INTERNAL:
+    case GIMP_PDB_PROC_TYPE_INTERNAL:
       return FALSE;
 
-    case GIMP_PLUGIN:
-    case GIMP_EXTENSION:
+    case GIMP_PDB_PROC_TYPE_PLUGIN:
+    case GIMP_PDB_PROC_TYPE_EXTENSION:
       if (plug_in->call_mode != GIMP_PLUG_IN_CALL_QUERY &&
           plug_in->call_mode != GIMP_PLUG_IN_CALL_INIT)
         return FALSE;
 
-    case GIMP_TEMPORARY:
+    case GIMP_PDB_PROC_TYPE_TEMPORARY:
       break;
     }
 
diff --git a/app/plug-in/gimppluginmanager-call.c b/app/plug-in/gimppluginmanager-call.c
index ef16d9b638..be645d8bae 100644
--- a/app/plug-in/gimppluginmanager-call.c
+++ b/app/plug-in/gimppluginmanager-call.c
@@ -261,7 +261,7 @@ gimp_plug_in_manager_call_run (GimpPlugInManager   *manager,
       /* If this is an extension,
        * wait for an installation-confirmation message
        */
-      if (GIMP_PROCEDURE (procedure)->proc_type == GIMP_EXTENSION)
+      if (GIMP_PROCEDURE (procedure)->proc_type == GIMP_PDB_PROC_TYPE_EXTENSION)
         {
           plug_in->ext_main_loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/app/plug-in/gimppluginmanager-restore.c b/app/plug-in/gimppluginmanager-restore.c
index 6476aff2cc..45e245a225 100644
--- a/app/plug-in/gimppluginmanager-restore.c
+++ b/app/plug-in/gimppluginmanager-restore.c
@@ -569,8 +569,8 @@ gimp_plug_in_manager_run_extensions (GimpPlugInManager  *manager,
     {
       GimpPlugInProcedure *proc = list->data;
 
-      if (proc->file                                         &&
-          GIMP_PROCEDURE (proc)->proc_type == GIMP_EXTENSION &&
+      if (proc->file                                                       &&
+          GIMP_PROCEDURE (proc)->proc_type == GIMP_PDB_PROC_TYPE_EXTENSION &&
           GIMP_PROCEDURE (proc)->num_args  == 0)
         {
           extensions = g_list_prepend (extensions, proc);
diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c
index b6e0e5afc1..3a006abb80 100644
--- a/app/plug-in/gimppluginprocedure.c
+++ b/app/plug-in/gimppluginprocedure.c
@@ -140,7 +140,7 @@ gimp_plug_in_procedure_class_init (GimpPlugInProcedureClass *klass)
 static void
 gimp_plug_in_procedure_init (GimpPlugInProcedure *proc)
 {
-  GIMP_PROCEDURE (proc)->proc_type = GIMP_PLUGIN;
+  GIMP_PROCEDURE (proc)->proc_type = GIMP_PDB_PROC_TYPE_PLUGIN;
 
   proc->icon_data_length = -1;
 }
@@ -395,7 +395,7 @@ gimp_plug_in_procedure_execute (GimpProcedure  *procedure,
       return return_vals;
     }
 
-  if (procedure->proc_type == GIMP_INTERNAL)
+  if (procedure->proc_type == GIMP_PDB_PROC_TYPE_INTERNAL)
     return GIMP_PROCEDURE_CLASS (parent_class)->execute (procedure, gimp,
                                                          context, progress,
                                                          args, error);
@@ -518,8 +518,8 @@ gimp_plug_in_procedure_new (GimpPDBProcType  proc_type,
 {
   GimpPlugInProcedure *proc;
 
-  g_return_val_if_fail (proc_type == GIMP_PLUGIN ||
-                        proc_type == GIMP_EXTENSION, NULL);
+  g_return_val_if_fail (proc_type == GIMP_PDB_PROC_TYPE_PLUGIN ||
+                        proc_type == GIMP_PDB_PROC_TYPE_EXTENSION, NULL);
   g_return_val_if_fail (G_IS_FILE (file), NULL);
 
   proc = g_object_new (GIMP_TYPE_PLUG_IN_PROCEDURE, NULL);
diff --git a/app/plug-in/gimptemporaryprocedure.c b/app/plug-in/gimptemporaryprocedure.c
index 5b03d05111..e0a269a500 100644
--- a/app/plug-in/gimptemporaryprocedure.c
+++ b/app/plug-in/gimptemporaryprocedure.c
@@ -78,7 +78,7 @@ gimp_temporary_procedure_class_init (GimpTemporaryProcedureClass *klass)
 static void
 gimp_temporary_procedure_init (GimpTemporaryProcedure *proc)
 {
-  GIMP_PROCEDURE (proc)->proc_type = GIMP_TEMPORARY;
+  GIMP_PROCEDURE (proc)->proc_type = GIMP_PDB_PROC_TYPE_TEMPORARY;
 }
 
 static void
diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c
index 1dcd53619f..561be6beb3 100644
--- a/app/plug-in/plug-in-rc.c
+++ b/app/plug-in/plug-in-rc.c
@@ -406,8 +406,8 @@ plug_in_procedure_deserialize (GScanner             *scanner,
       return G_TOKEN_INT;
     }
 
-  if (proc_type != GIMP_PLUGIN &&
-      proc_type != GIMP_EXTENSION)
+  if (proc_type != GIMP_PDB_PROC_TYPE_PLUGIN &&
+      proc_type != GIMP_PDB_PROC_TYPE_EXTENSION)
     {
       g_free (str);
       g_scanner_error (scanner, "procedure type %d is out of range",
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
index 7c90d4986a..c855d135f7 100644
--- a/app/xcf/xcf.c
+++ b/app/xcf/xcf.c
@@ -104,10 +104,10 @@ xcf_init (Gimp *gimp)
 
   /*  gimp-xcf-save  */
   file = g_file_new_for_path ("gimp-xcf-save");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = xcf_save_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
@@ -175,10 +175,10 @@ xcf_init (Gimp *gimp)
 
   /*  gimp-xcf-load  */
   file = g_file_new_for_path ("gimp-xcf-load");
-  procedure = gimp_plug_in_procedure_new (GIMP_PLUGIN, file);
+  procedure = gimp_plug_in_procedure_new (GIMP_PDB_PROC_TYPE_PLUGIN, file);
   g_object_unref (file);
 
-  procedure->proc_type    = GIMP_INTERNAL;
+  procedure->proc_type    = GIMP_PDB_PROC_TYPE_INTERNAL;
   procedure->marshal_func = xcf_load_invoker;
 
   proc = GIMP_PLUG_IN_PROCEDURE (procedure);
diff --git a/libgimp/gimpbrushselect.c b/libgimp/gimpbrushselect.c
index e0ccfc2800..dcfdaa4f42 100644
--- a/libgimp/gimpbrushselect.c
+++ b/libgimp/gimpbrushselect.c
@@ -79,7 +79,7 @@ gimp_brush_select_new (const gchar          *title,
 
   procedure = gimp_procedure_new (plug_in,
                                   brush_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_brush_run,
                                   brush_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimpfontselect.c b/libgimp/gimpfontselect.c
index 5c87cc4511..5c4714fda5 100644
--- a/libgimp/gimpfontselect.c
+++ b/libgimp/gimpfontselect.c
@@ -70,7 +70,7 @@ gimp_font_select_new (const gchar         *title,
 
   procedure = gimp_procedure_new (plug_in,
                                   font_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_font_run,
                                   font_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimpgradientselect.c b/libgimp/gimpgradientselect.c
index 207b552b96..3982aea0df 100644
--- a/libgimp/gimpgradientselect.c
+++ b/libgimp/gimpgradientselect.c
@@ -73,7 +73,7 @@ gimp_gradient_select_new (const gchar             *title,
 
   procedure = gimp_procedure_new (plug_in,
                                   gradient_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_gradient_run,
                                   gradient_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimpimageprocedure.c b/libgimp/gimpimageprocedure.c
index e351596e35..ec5c2d8dbb 100644
--- a/libgimp/gimpimageprocedure.c
+++ b/libgimp/gimpimageprocedure.c
@@ -189,7 +189,8 @@ gimp_image_procedure_new (GimpPlugIn       *plug_in,
 
   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_INTERNAL, 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,
diff --git a/libgimp/gimplegacy.c b/libgimp/gimplegacy.c
index ad4a5aec5d..746a484149 100644
--- a/libgimp/gimplegacy.c
+++ b/libgimp/gimplegacy.c
@@ -142,24 +142,25 @@ gimp_main_legacy (const GimpPlugInInfo *info,
  * "*" for all image types. If the procedure doesn't need an image to
  * run, use the empty string.
  *
- * @type must be one of %GIMP_PLUGIN or %GIMP_EXTENSION. Note that
- * temporary procedures must be installed using
- * gimp_install_temp_proc().
+ * @type must be one of %GIMP_PDB_PROC_TYPE_PLUGIN or
+ * %GIMP_PDB_PROC_TYPE_EXTENSION. Note that temporary procedures must
+ * be installed using gimp_install_temp_proc().
  *
- * NOTE: Unlike the GIMP 1.2 API, %GIMP_EXTENSION no longer means
- * that the procedure's menu prefix is &lt;Toolbox&gt;, but that
- * it will install temporary procedures. Therefore, the GIMP core
- * will wait until the %GIMP_EXTENSION procedure has called
- * gimp_extension_ack(), which means that the procedure has done
- * its initialization, installed its temporary procedures and is
+ * NOTE: Unlike the GIMP 1.2 API, %GIMP_PDB_PROC_TYPE_EXTENSION no
+ * longer means that the procedure's menu prefix is &lt;Toolbox&gt;,
+ * but that it will install temporary procedures. Therefore, the GIMP
+ * core will wait until the %GIMP_PDB_PROC_TYPE_EXTENSION procedure
+ * has called gimp_extension_ack(), which means that the procedure has
+ * done its initialization, installed its temporary procedures and is
  * ready to run.
  *
- * <emphasis>Not calling gimp_extension_ack() from a %GIMP_EXTENSION
- * procedure will cause the GIMP core to lock up.</emphasis>
+ * <emphasis>Not calling gimp_extension_ack() from a
+ * %GIMP_PDB_PROC_TYPE_EXTENSION procedure will cause the GIMP core to
+ * lock up.</emphasis>
  *
- * Additionally, a %GIMP_EXTENSION procedure with no parameters
- * (@n_params == 0 and @params == %NULL) is an "automatic" extension
- * that will be automatically started on each GIMP startup.
+ * Additionally, a %GIMP_PDB_PROC_TYPE_EXTENSION procedure with no
+ * parameters (@n_params == 0 and @params == %NULL) is an "automatic"
+ * extension that will be automatically started on each GIMP startup.
  **/
 void
 gimp_install_procedure (const gchar        *name,
@@ -181,7 +182,7 @@ gimp_install_procedure (const gchar        *name,
   gint           i;
 
   g_return_if_fail (name != NULL);
-  g_return_if_fail (type != GIMP_INTERNAL);
+  g_return_if_fail (type != GIMP_PDB_PROC_TYPE_INTERNAL);
   g_return_if_fail ((n_params == 0 && params == NULL) ||
                     (n_params > 0  && params != NULL));
   g_return_if_fail ((n_return_vals == 0 && return_vals == NULL) ||
diff --git a/libgimp/gimplegacy.h b/libgimp/gimplegacy.h
index e6a6af276a..d191ffa777 100644
--- a/libgimp/gimplegacy.h
+++ b/libgimp/gimplegacy.h
@@ -30,6 +30,11 @@ G_BEGIN_DECLS
 #ifndef GIMP_DISABLE_COMPAT_CRUFT
 
 
+#ifdef GIMP_DEPRECATED_REPLACE_NEW_API
+#define GIMP_PLUGIN GIMP_PDB_PROC_TYPE_PLUGIN
+#endif
+
+
 /**
  * GimpInitProc:
  *
diff --git a/libgimp/gimploadprocedure.c b/libgimp/gimploadprocedure.c
index 21b8d389b6..87c926a07c 100644
--- a/libgimp/gimploadprocedure.c
+++ b/libgimp/gimploadprocedure.c
@@ -247,7 +247,8 @@ gimp_load_procedure_new (GimpPlugIn      *plug_in,
 
   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_INTERNAL, 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,
diff --git a/libgimp/gimppaletteselect.c b/libgimp/gimppaletteselect.c
index 8d296de105..0df01c3f4c 100644
--- a/libgimp/gimppaletteselect.c
+++ b/libgimp/gimppaletteselect.c
@@ -71,7 +71,7 @@ gimp_palette_select_new (const gchar            *title,
 
   procedure = gimp_procedure_new (plug_in,
                                   palette_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_palette_run,
                                   palette_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimppatternselect.c b/libgimp/gimppatternselect.c
index ec3528ecab..da53110a06 100644
--- a/libgimp/gimppatternselect.c
+++ b/libgimp/gimppatternselect.c
@@ -74,7 +74,7 @@ gimp_pattern_select_new (const gchar            *title,
 
   procedure = gimp_procedure_new (plug_in,
                                   pattern_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_pattern_run,
                                   pattern_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimpplugin.c b/libgimp/gimpplugin.c
index 965e80246a..a38ed9de3e 100644
--- a/libgimp/gimpplugin.c
+++ b/libgimp/gimpplugin.c
@@ -413,8 +413,8 @@ gimp_plug_in_add_menu_branch (GimpPlugIn  *plug_in,
  * @procedure_name: A procedure name.
  *
  * This functiond creates a new procedure and is called when a plug-in
- * instance is started by GIMP when one of the %GIMP_PLUGIN or
- * %GIMP_EXTENSION procedures it implements is invoked.
+ * instance is started by GIMP when one of the %GIMP_PDB_PROC_TYPE_PLUGIN or
+ * %GIMP_PDB_PROC_TYPE_EXTENSION procedures it implements is invoked.
  *
  * This function will only ever be called with names returned by
  * implementations of GimpPlugInClass::init_procedures() or
@@ -439,16 +439,17 @@ gimp_plug_in_create_procedure (GimpPlugIn  *plug_in,
 /**
  * gimp_plug_in_add_temp_procedure:
  * @plug_in:   A #GimpPlugIn
- * @procedure: A #GimpProcedure of type %GIMP_TEMPORARY.
+ * @procedure: A #GimpProcedure of type %GIMP_PDB_PROC_TYPE_TEMPORARY.
  *
  * This function adds a temporary procedure to @plug_in. It is usually
- * called from a %GIMP_EXTENSION procedure's GimpProcedure::run().
+ * called from a %GIMP_PDB_PROC_TYPE_EXTENSION procedure's
+ * GimpProcedure::run().
  *
  * A temporary procedure is a procedure which is only available while
  * one of your plug-in's "real" procedures is running.
  *
- * The procedure's type <emphasis>must</emphasis> be %GIMP_TEMPORARY
- * or the function will fail.
+ * The procedure's type <emphasis>must</emphasis> be
+ * %GIMP_PDB_PROC_TYPE_TEMPORARY or the function will fail.
  *
  * NOTE: Normally, plug-in communication is triggered by the plug-in
  * and the GIMP core only responds to the plug-in's requests. You must
@@ -466,7 +467,7 @@ gimp_plug_in_add_temp_procedure (GimpPlugIn    *plug_in,
   g_return_if_fail (GIMP_IS_PLUG_IN (plug_in));
   g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
   g_return_if_fail (gimp_procedure_get_proc_type (procedure) ==
-                    GIMP_TEMPORARY);
+                    GIMP_PDB_PROC_TYPE_TEMPORARY);
 
   plug_in->priv->temp_procedures =
     g_list_prepend (plug_in->priv->temp_procedures,
@@ -580,8 +581,8 @@ gimp_plug_in_get_temp_procedure (GimpPlugIn  *plug_in,
  * it has a GUI and is hanging around in a #GMainLoop, it must call
  * gimp_plug_in_extension_enable().
  *
- * Note that the plug-in does not need to be a #GIMP_EXTENSION to
- * register temporary procedures.
+ * Note that the plug-in does not need to be a
+ * #GIMP_PDB_PROC_TYPE_EXTENSION to register temporary procedures.
  *
  * See also: gimp_plug_in_add_temp_procedure().
  *
diff --git a/libgimp/gimpprocedure.c b/libgimp/gimpprocedure.c
index 25e7e83381..8e8bcbcfcf 100644
--- a/libgimp/gimpprocedure.c
+++ b/libgimp/gimpprocedure.c
@@ -161,7 +161,7 @@ gimp_procedure_class_init (GimpProcedureClass *klass)
                        "Procedure type",
                        "The procedure's type",
                        GIMP_TYPE_PDB_PROC_TYPE,
-                       GIMP_PLUGIN,
+                       GIMP_PDB_PROC_TYPE_PLUGIN,
                        GIMP_PARAM_READWRITE |
                        G_PARAM_CONSTRUCT_ONLY);
 
@@ -453,31 +453,32 @@ gimp_procedure_real_run (GimpProcedure        *procedure,
  * overwrite an already existing procedure (overwrite procedures only
  * if you know what you're doing).
  *
- * @proc_type should be %GIMP_PLUGIN for "normal" plug-ins.
+ * @proc_type should be %GIMP_PDB_PROC_TYPE_PLUGIN for "normal" plug-ins.
  *
- * Using %GIMP_EXTENSION means that the plug-in will add temporary
- * procedures. Therefore, the GIMP core will wait until the
- * %GIMP_EXTENSION procedure has called
+ * Using %GIMP_PDB_PROC_TYPE_EXTENSION means that the plug-in will add
+ * temporary procedures. Therefore, the GIMP core will wait until the
+ * %GIMP_PDB_PROC_TYPE_EXTENSION procedure has called
  * gimp_procedure_extension_ready(), which means that the procedure
  * has done its initialization, installed its temporary procedures and
  * is ready to run.
  *
  * <emphasis>Not calling gimp_procedure_extension_ready() from a
- * %GIMP_EXTENSION procedure will cause the GIMP core to lock
- * up.</emphasis>
+ * %GIMP_PDB_PROC_TYPE_EXTENSION procedure will cause the GIMP core to
+ * lock up.</emphasis>
  *
- * Additionally, a %GIMP_EXTENSION procedure with no arguments added
- * is an "automatic" extension that will be automatically started on
- * each GIMP startup.
+ * Additionally, a %GIMP_PDB_PROC_TYPE_EXTENSION procedure with no
+ * arguments added is an "automatic" extension that will be
+ * automatically started on each GIMP startup.
  *
- * %GIMP_TEMPORARY must be used for temporary procedures that are
- * created during a plug-ins lifetime. They must be added to the
- * #GimpPlugIn using gimp_plug_in_add_temp_procedure().
+ * %GIMP_PDB_PROC_TYPE_TEMPORARY must be used for temporary procedures
+ * that are created during a plug-ins lifetime. They must be added to
+ * the #GimpPlugIn using gimp_plug_in_add_temp_procedure().
  *
  * @run_func is called via gimp_procedure_run().
  *
- * For %GIMP_PLUGIN and %GIMP_EXTENSION procedures the call of
- * @run_func is basically the lifetime of the plug-in.
+ * For %GIMP_PDB_PROC_TYPE_PLUGIN and %GIMP_PDB_PROC_TYPE_EXTENSION
+ * procedures the call of @run_func is basically the lifetime of the
+ * plug-in.
  *
  * Returns: a new #GimpProcedure.
  *
@@ -495,7 +496,7 @@ gimp_procedure_new (GimpPlugIn      *plug_in,
 
   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_INTERNAL, NULL);
+  g_return_val_if_fail (proc_type != GIMP_PDB_PROC_TYPE_INTERNAL, NULL);
   g_return_val_if_fail (run_func != NULL, NULL);
 
   procedure = g_object_new (GIMP_TYPE_PROCEDURE,
@@ -554,7 +555,8 @@ gimp_procedure_get_name (GimpProcedure *procedure)
 GimpPDBProcType
 gimp_procedure_get_proc_type (GimpProcedure *procedure)
 {
-  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), GIMP_PLUGIN);
+  g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure),
+                        GIMP_PDB_PROC_TYPE_PLUGIN);
 
   return procedure->priv->proc_type;
 }
@@ -1387,7 +1389,8 @@ gimp_procedure_run (GimpProcedure  *procedure,
  * properly initialized and is ready to run.
  *
  * This function <emphasis>must</emphasis> be called from every
- * procedure's #GimpRunFunc that was created as #GIMP_EXTENSION.
+ * procedure's #GimpRunFunc that was created as
+ * #GIMP_PDB_PROC_TYPE_EXTENSION.
  *
  * Subsequently, extensions can process temporary procedure run
  * requests using either gimp_plug_in_extension_enable() or
@@ -1403,7 +1406,7 @@ gimp_procedure_extension_ready (GimpProcedure *procedure)
   GimpPlugIn *plug_in;
 
   g_return_if_fail (GIMP_IS_PROCEDURE (procedure));
-  g_return_if_fail (procedure->priv->proc_type == GIMP_EXTENSION);
+  g_return_if_fail (procedure->priv->proc_type == GIMP_PDB_PROC_TYPE_EXTENSION);
 
   plug_in = gimp_procedure_get_plug_in (procedure);
 
diff --git a/libgimp/gimpprogress.c b/libgimp/gimpprogress.c
index 580ab4d15a..186587bfe0 100644
--- a/libgimp/gimpprogress.c
+++ b/libgimp/gimpprogress.c
@@ -100,7 +100,7 @@ gimp_progress_install_vtable (const GimpProgressVtable *vtable,
 
   procedure = gimp_procedure_new (plug_in,
                                   progress_callback,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   gimp_temp_progress_run,
                                   progress_data,
                                   (GDestroyNotify)
diff --git a/libgimp/gimpsaveprocedure.c b/libgimp/gimpsaveprocedure.c
index 9376e8e1cf..20e4da5e72 100644
--- a/libgimp/gimpsaveprocedure.c
+++ b/libgimp/gimpsaveprocedure.c
@@ -231,7 +231,8 @@ gimp_save_procedure_new (GimpPlugIn      *plug_in,
 
   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_INTERNAL, 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_SAVE_PROCEDURE,
diff --git a/libgimp/gimpthumbnailprocedure.c b/libgimp/gimpthumbnailprocedure.c
index 78e3aaab73..c0beb36be2 100644
--- a/libgimp/gimpthumbnailprocedure.c
+++ b/libgimp/gimpthumbnailprocedure.c
@@ -222,7 +222,8 @@ gimp_thumbnail_procedure_new (GimpPlugIn           *plug_in,
 
   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_INTERNAL, 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_THUMBNAIL_PROCEDURE,
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index e8372bd02a..d8e394843b 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -1345,19 +1345,19 @@ gimp_pdb_proc_type_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_INTERNAL, "GIMP_INTERNAL", "internal" },
-    { GIMP_PLUGIN, "GIMP_PLUGIN", "plugin" },
-    { GIMP_EXTENSION, "GIMP_EXTENSION", "extension" },
-    { GIMP_TEMPORARY, "GIMP_TEMPORARY", "temporary" },
+    { GIMP_PDB_PROC_TYPE_INTERNAL, "GIMP_PDB_PROC_TYPE_INTERNAL", "internal" },
+    { GIMP_PDB_PROC_TYPE_PLUGIN, "GIMP_PDB_PROC_TYPE_PLUGIN", "plugin" },
+    { GIMP_PDB_PROC_TYPE_EXTENSION, "GIMP_PDB_PROC_TYPE_EXTENSION", "extension" },
+    { GIMP_PDB_PROC_TYPE_TEMPORARY, "GIMP_PDB_PROC_TYPE_TEMPORARY", "temporary" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_INTERNAL, NC_("pdb-proc-type", "Internal GIMP procedure"), NULL },
-    { GIMP_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-In"), NULL },
-    { GIMP_EXTENSION, NC_("pdb-proc-type", "GIMP Extension"), NULL },
-    { GIMP_TEMPORARY, NC_("pdb-proc-type", "Temporary Procedure"), NULL },
+    { GIMP_PDB_PROC_TYPE_INTERNAL, NC_("pdb-proc-type", "Internal GIMP procedure"), NULL },
+    { GIMP_PDB_PROC_TYPE_PLUGIN, NC_("pdb-proc-type", "GIMP Plug-In"), NULL },
+    { GIMP_PDB_PROC_TYPE_EXTENSION, NC_("pdb-proc-type", "GIMP Extension"), NULL },
+    { GIMP_PDB_PROC_TYPE_TEMPORARY, NC_("pdb-proc-type", "Temporary Procedure"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index d2044c9b2d..64240e69a9 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -908,10 +908,10 @@ typedef enum
 
 /**
  * GimpPDBProcType:
- * @GIMP_INTERNAL:  Internal GIMP procedure
- * @GIMP_PLUGIN:    GIMP Plug-In
- * @GIMP_EXTENSION: GIMP Extension
- * @GIMP_TEMPORARY: Temporary Procedure
+ * @GIMP_PDB_PROC_TYPE_INTERNAL:  Internal GIMP procedure
+ * @GIMP_PDB_PROC_TYPE_PLUGIN:    GIMP Plug-In
+ * @GIMP_PDB_PROC_TYPE_EXTENSION: GIMP Extension
+ * @GIMP_PDB_PROC_TYPE_TEMPORARY: Temporary Procedure
  *
  * Types of PDB procedures.
  **/
@@ -921,10 +921,10 @@ GType gimp_pdb_proc_type_get_type (void) G_GNUC_CONST;
 
 typedef enum
 {
-  GIMP_INTERNAL,   /*< desc="Internal GIMP procedure" >*/
-  GIMP_PLUGIN,     /*< desc="GIMP Plug-In" >*/
-  GIMP_EXTENSION,  /*< desc="GIMP Extension" >*/
-  GIMP_TEMPORARY   /*< desc="Temporary Procedure" >*/
+  GIMP_PDB_PROC_TYPE_INTERNAL,   /*< desc="Internal GIMP procedure" >*/
+  GIMP_PDB_PROC_TYPE_PLUGIN,     /*< desc="GIMP Plug-In" >*/
+  GIMP_PDB_PROC_TYPE_EXTENSION,  /*< desc="GIMP Extension" >*/
+  GIMP_PDB_PROC_TYPE_TEMPORARY   /*< desc="Temporary Procedure" >*/
 } GimpPDBProcType;
 
 
diff --git a/pdb/enums.pl b/pdb/enums.pl
index 9b4d50544d..c1d74d22f3 100644
--- a/pdb/enums.pl
+++ b/pdb/enums.pl
@@ -438,12 +438,14 @@ package Gimp::CodeGen::enums;
     GimpPDBProcType =>
        { contig => 1,
          header => 'libgimpbase/gimpbaseenums.h',
-         symbols => [ qw(GIMP_INTERNAL GIMP_PLUGIN GIMP_EXTENSION
-                         GIMP_TEMPORARY) ],
-         mapping => { GIMP_INTERNAL => '0',
-                      GIMP_PLUGIN => '1',
-                      GIMP_EXTENSION => '2',
-                      GIMP_TEMPORARY => '3' }
+         symbols => [ qw(GIMP_PDB_PROC_TYPE_INTERNAL
+                         GIMP_PDB_PROC_TYPE_PLUGIN
+                         GIMP_PDB_PROC_TYPE_EXTENSION
+                         GIMP_PDB_PROC_TYPE_TEMPORARY) ],
+         mapping => { GIMP_PDB_PROC_TYPE_INTERNAL => '0',
+                      GIMP_PDB_PROC_TYPE_PLUGIN => '1',
+                      GIMP_PDB_PROC_TYPE_EXTENSION => '2',
+                      GIMP_PDB_PROC_TYPE_TEMPORARY => '3' }
        },
     GimpPDBStatusType =>
        { contig => 1,
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c
index 1edc3686c3..d1e0648883 100644
--- a/plug-ins/common/align-layers.c
+++ b/plug-ins/common/align-layers.c
@@ -181,7 +181,8 @@ align_layers_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             align_layers_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index f40927a531..d217e9c7bf 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -241,7 +241,8 @@ play_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             play_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index 89d324707b..2a340d5295 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -121,7 +121,7 @@ query (void)
                           "1997",
                           N_("_Blinds..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 }
diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
index 331130447f..4c1867e3dd 100644
--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@@ -125,7 +125,8 @@ border_average_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      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*");
diff --git a/plug-ins/common/busy-dialog.c b/plug-ins/common/busy-dialog.c
index 3fa4d09ee1..f6e77f4c43 100644
--- a/plug-ins/common/busy-dialog.c
+++ b/plug-ins/common/busy-dialog.c
@@ -114,15 +114,19 @@ busy_dialog_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       busy_dialog_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
-                                        "Show a dialog while waiting for an operation to finish",
-                                        "Used by GIMP to display a dialog, containing a "
-                                        "spinner and a custom message, while waiting for an "
-                                        "ongoing operation to finish. Optionally, the dialog "
-                                        "may provide a \"Cancel\" button, which can be used "
+                                        "Show a dialog while waiting for an "
+                                        "operation to finish",
+                                        "Used by GIMP to display a dialog, "
+                                        "containing a spinner and a custom "
+                                        "message, while waiting for an "
+                                        "ongoing operation to finish. "
+                                        "Optionally, the dialog may provide "
+                                        "a \"Cancel\" button, which can be used "
                                         "to cancel the operation.",
                                         name);
       gimp_procedure_set_attribution (procedure,
diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c
index 3b413fb449..cdc8051e78 100644
--- a/plug-ins/common/checkerboard.c
+++ b/plug-ins/common/checkerboard.c
@@ -95,7 +95,7 @@ query (void)
                           "1997",
                           N_("_Checkerboard (legacy)..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 85b7b9487d..3961b02f11 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -119,7 +119,8 @@ remap_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC_REMAP))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             remap_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED*");
@@ -154,7 +155,8 @@ remap_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PLUG_IN_PROC_SWAP))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             remap_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED*");
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index ea245e7fa6..dd2e30e430 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -398,7 +398,8 @@ compose_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, COMPOSE_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             compose_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "GRAY*");
@@ -449,7 +450,8 @@ compose_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, DRAWABLE_COMPOSE_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             compose_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "GRAY*");
@@ -497,7 +499,8 @@ compose_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, RECOMPOSE_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             compose_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "GRAY*");
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index c1982f0432..0b3cb5781d 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -167,7 +167,7 @@ query (void)
                           "2003",
                           N_("Retine_x..."),
                           "RGB*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index caf845ed16..1931a53e06 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -288,7 +288,8 @@ decompose_create_procedure (GimpPlugIn  *plug_in,
           g_string_append_c (type_desc, '"');
         }
 
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             decompose_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*");
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index 6a576ff641..0a4ad76550 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -158,7 +158,7 @@ query (void)
                           PLUG_IN_VERSION,
                           N_("Des_peckle..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index 9696fb760a..bee5d8ba6c 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -110,7 +110,7 @@ query (void)
                           PLUG_IN_VERSION,
                           N_("Des_tripe..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c
index 5b11ccbe04..be19c67f96 100644
--- a/plug-ins/common/file-aa.c
+++ b/plug-ins/common/file-aa.c
@@ -115,7 +115,8 @@ ascii_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            ascii_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-cel.c b/plug-ins/common/file-cel.c
index 7a819064d5..80755d2b5e 100644
--- a/plug-ins/common/file-cel.c
+++ b/plug-ins/common/file-cel.c
@@ -130,7 +130,8 @@ cel_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            cel_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("KISS CEL"));
@@ -159,7 +160,8 @@ cel_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            cel_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*, INDEXED*");
diff --git a/plug-ins/common/file-compressor.c b/plug-ins/common/file-compressor.c
index 559d098910..8059afcc41 100644
--- a/plug-ins/common/file-compressor.c
+++ b/plug-ins/common/file-compressor.c
@@ -309,7 +309,8 @@ compressor_create_procedure (GimpPlugIn  *plug_in,
 
       if (! strcmp (name, compressor->load_proc))
         {
-          procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_load_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                compressor_load,
                                                (gpointer) compressor, NULL);
 
@@ -323,7 +324,8 @@ compressor_create_procedure (GimpPlugIn  *plug_in,
         }
       else if (! strcmp (name, compressor->save_proc))
         {
-          procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_save_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                compressor_save,
                                                (gpointer) compressor, NULL);
 
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index 38537d7c1d..d201e168cd 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -136,7 +136,8 @@ csource_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            csource_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-desktop-link.c b/plug-ins/common/file-desktop-link.c
index 305d4756e8..a6bd22036a 100644
--- a/plug-ins/common/file-desktop-link.c
+++ b/plug-ins/common/file-desktop-link.c
@@ -103,7 +103,8 @@ desktop_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            desktop_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Desktop Link"));
diff --git a/plug-ins/common/file-dicom.c b/plug-ins/common/file-dicom.c
index 28a7357054..0fa85bce55 100644
--- a/plug-ins/common/file-dicom.c
+++ b/plug-ins/common/file-dicom.c
@@ -161,7 +161,8 @@ dicom_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            dicom_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("DICOM image"));
@@ -189,7 +190,8 @@ dicom_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            dicom_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY");
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 37b26f074b..b014b3bc37 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -127,7 +127,8 @@ gbr_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            gbr_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-gegl.c b/plug-ins/common/file-gegl.c
index 9e3d70b160..1c81259caa 100644
--- a/plug-ins/common/file-gegl.c
+++ b/plug-ins/common/file-gegl.c
@@ -181,7 +181,8 @@ goat_create_procedure (GimpPlugIn  *plug_in,
 
       if (! g_strcmp0 (name, format->load_proc))
         {
-          procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_load_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                goat_load,
                                                (gpointer) format, NULL);
 
@@ -201,7 +202,8 @@ goat_create_procedure (GimpPlugIn  *plug_in,
         }
       else if (! g_strcmp0 (name, format->save_proc))
         {
-          procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_save_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                goat_save,
                                                (gpointer) format, NULL);
 
diff --git a/plug-ins/common/file-gif-load.c b/plug-ins/common/file-gif-load.c
index 3f3c1ce74c..d278681842 100644
--- a/plug-ins/common/file-gif-load.c
+++ b/plug-ins/common/file-gif-load.c
@@ -167,7 +167,8 @@ gif_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            gif_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("GIF image"));
@@ -196,7 +197,8 @@ gif_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 gif_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/file-gif-save.c b/plug-ins/common/file-gif-save.c
index 4aad6b8ed6..e312c9fd40 100644
--- a/plug-ins/common/file-gif-save.c
+++ b/plug-ins/common/file-gif-save.c
@@ -169,7 +169,8 @@ gif_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            gif_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED*, GRAY*");
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index 39674c081d..542072b538 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -166,7 +166,8 @@ gih_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            gih_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*, GRAY*");
diff --git a/plug-ins/common/file-glob.c b/plug-ins/common/file-glob.c
index 2022de3c84..fa494dfbdb 100644
--- a/plug-ins/common/file-glob.c
+++ b/plug-ins/common/file-glob.c
@@ -96,7 +96,8 @@ glob_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       glob_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/file-header.c b/plug-ins/common/file-header.c
index 58921c8ba9..0d5c4afa95 100644
--- a/plug-ins/common/file-header.c
+++ b/plug-ins/common/file-header.c
@@ -105,7 +105,8 @@ header_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            header_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, RGB");
diff --git a/plug-ins/common/file-heif.c b/plug-ins/common/file-heif.c
index 3e39708e54..8c1433694a 100644
--- a/plug-ins/common/file-heif.c
+++ b/plug-ins/common/file-heif.c
@@ -130,7 +130,8 @@ heif_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            heif_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("HEIF/HEIC"));
@@ -167,7 +168,8 @@ heif_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            heif_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*");
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index b04751cd40..c61fbe2612 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -175,7 +175,8 @@ html_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            html_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-jp2-load.c b/plug-ins/common/file-jp2-load.c
index 0a741833e8..7ba3eea8b2 100644
--- a/plug-ins/common/file-jp2-load.c
+++ b/plug-ins/common/file-jp2-load.c
@@ -174,7 +174,8 @@ jp2_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_JP2_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            jp2_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("JPEG 2000 image"));
@@ -205,7 +206,8 @@ jp2_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_J2K_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            jp2_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("JPEG 2000 codestream"));
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index ede8aec82a..7340a7048d 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -280,7 +280,8 @@ mng_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            mng_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index d141fff3f3..564379779a 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -101,7 +101,8 @@ pat_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pat_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c
index 1b1643ffa2..b888e19ecc 100644
--- a/plug-ins/common/file-pcx.c
+++ b/plug-ins/common/file-pcx.c
@@ -171,7 +171,8 @@ pcx_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pcx_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("ZSoft PCX image"));
@@ -194,7 +195,8 @@ pcx_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pcx_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, RGB, GRAY");
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index 7fe20c3b16..93ba50d4a2 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -319,7 +319,8 @@ pdf_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pdf_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Portable Document Format"));
@@ -366,7 +367,8 @@ pdf_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 pdf_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-save.c
index cbbc909118..2d134b68af 100644
--- a/plug-ins/common/file-pdf-save.c
+++ b/plug-ins/common/file-pdf-save.c
@@ -340,7 +340,8 @@ pdf_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pdf_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
@@ -398,7 +399,8 @@ pdf_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_MULTI_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       pdf_save_multi, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-pix.c b/plug-ins/common/file-pix.c
index 9bac899a53..197791e561 100644
--- a/plug-ins/common/file-pix.c
+++ b/plug-ins/common/file-pix.c
@@ -156,7 +156,8 @@ pix_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      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),
@@ -180,7 +181,8 @@ pix_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pix_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 69918a766f..c2beeb201c 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -274,7 +274,8 @@ png_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            png_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("PNG image"));
@@ -301,7 +302,8 @@ png_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            png_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-pnm.c b/plug-ins/common/file-pnm.c
index 0215248d3c..f24ad4dfb2 100644
--- a/plug-ins/common/file-pnm.c
+++ b/plug-ins/common/file-pnm.c
@@ -283,7 +283,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("PNM Image"));
@@ -311,7 +312,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PNM_SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
@@ -343,7 +345,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PBM_SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
@@ -375,7 +378,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PGM_SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
@@ -407,7 +411,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PPM_SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
@@ -439,7 +444,8 @@ pnm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PFM_SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            pnm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index c3296cff7d..55365d9676 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -367,7 +367,8 @@ ps_create_procedure (GimpPlugIn  *plug_in,
   if (! strcmp (name, LOAD_PS_PROC) ||
       ! strcmp (name, LOAD_EPS_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            ps_load, NULL, NULL);
 
       if (! strcmp (name, LOAD_PS_PROC))
@@ -462,7 +463,8 @@ ps_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_PS_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 ps_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -478,7 +480,8 @@ ps_create_procedure (GimpPlugIn  *plug_in,
   else if (! strcmp (name, SAVE_PS_PROC) ||
            ! strcmp (name, SAVE_EPS_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            ps_save, NULL, NULL);
 
       if (! strcmp (name, SAVE_PS_PROC))
diff --git a/plug-ins/common/file-psp.c b/plug-ins/common/file-psp.c
index 17c7aa6374..0dda7a97f8 100644
--- a/plug-ins/common/file-psp.c
+++ b/plug-ins/common/file-psp.c
@@ -620,7 +620,8 @@ psp_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            psp_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Paint Shop Pro image"));
@@ -647,7 +648,8 @@ psp_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            psp_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-raw-data.c b/plug-ins/common/file-raw-data.c
index 9b50233b25..e06060816f 100644
--- a/plug-ins/common/file-raw-data.c
+++ b/plug-ins/common/file-raw-data.c
@@ -275,7 +275,8 @@ raw_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            raw_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Raw image data"));
@@ -296,7 +297,8 @@ raw_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_HGT_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            raw_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure,
@@ -332,7 +334,8 @@ raw_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            raw_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, GRAY, RGB, RGBA");
@@ -483,7 +486,8 @@ raw_load (GimpProcedure        *procedure,
           sample_spacing != 3)
         {
           g_set_error (&error,
-                       GIMP_PLUGIN_HGT_LOAD_ERROR, GIMP_PLUGIN_HGT_LOAD_ARGUMENT_ERROR,
+                       GIMP_PLUGIN_HGT_LOAD_ERROR,
+                       GIMP_PLUGIN_HGT_LOAD_ARGUMENT_ERROR,
                        _("%d is not a valid sample spacing. "
                          "Valid values are: 0 (auto-detect), 1 and 3."),
                        sample_spacing);
diff --git a/plug-ins/common/file-sunras.c b/plug-ins/common/file-sunras.c
index f202679654..da62ad960a 100644
--- a/plug-ins/common/file-sunras.c
+++ b/plug-ins/common/file-sunras.c
@@ -272,7 +272,8 @@ sunras_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            sunras_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("SUN Rasterfile image"));
@@ -295,7 +296,8 @@ sunras_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            sunras_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index 2b938a6548..81816b4a77 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -149,7 +149,8 @@ svg_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            svg_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("SVG image"));
@@ -205,7 +206,8 @@ svg_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 svg_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
index 99e3e5b30e..203f743b99 100644
--- a/plug-ins/common/file-tga.c
+++ b/plug-ins/common/file-tga.c
@@ -257,7 +257,8 @@ tga_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            tga_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("TarGA image"));
@@ -280,7 +281,8 @@ tga_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            tga_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index 4062567952..bebb0e7195 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -144,7 +144,8 @@ wmf_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            wmf_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Microsoft WMF file"));
@@ -191,7 +192,8 @@ wmf_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 wmf_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index c8bd7f7e7b..fa4bc20395 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -198,7 +198,8 @@ xbm_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xbm_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("X BitMap image"));
@@ -223,7 +224,8 @@ xbm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xbm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED");
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index 3fc3c88146..66c6c6607b 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -328,7 +328,8 @@ xmc_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xmc_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("X11 Mouse Cursor"));
@@ -356,7 +357,8 @@ xmc_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 xmc_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -373,7 +375,8 @@ xmc_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xmc_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGBA");
diff --git a/plug-ins/common/file-xpm.c b/plug-ins/common/file-xpm.c
index 38941fb87a..2e6faa6103 100644
--- a/plug-ins/common/file-xpm.c
+++ b/plug-ins/common/file-xpm.c
@@ -192,7 +192,8 @@ xpm_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xpm_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("X PixMap image"));
@@ -224,7 +225,8 @@ xpm_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xpm_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
index c0bd1a2c33..6518d60a1a 100644
--- a/plug-ins/common/file-xwd.c
+++ b/plug-ins/common/file-xwd.c
@@ -309,7 +309,8 @@ xwd_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xwd_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("X window dump"));
@@ -336,7 +337,8 @@ xwd_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            xwd_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 8606a62102..3b7412f173 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -218,7 +218,8 @@ film_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             film_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/gradient-map.c b/plug-ins/common/gradient-map.c
index 0335d00304..97f500587e 100644
--- a/plug-ins/common/gradient-map.c
+++ b/plug-ins/common/gradient-map.c
@@ -116,7 +116,8 @@ map_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, GRADMAP_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             map_run,
                                             GINT_TO_POINTER (GRADIENT_MODE),
                                             NULL);
@@ -149,7 +150,8 @@ map_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, PALETTEMAP_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             map_run,
                                             GINT_TO_POINTER (PALETTE_MODE),
                                             NULL);
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index 7bb7025b7b..bf8c83a493 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -147,7 +147,7 @@ void query (void)
                           "1997 - 2000",
                           N_("_Grid (legacy)..."),
                           "RGB*, GRAY*, INDEXED*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/guillotine.c b/plug-ins/common/guillotine.c
index c3505d4cd7..3f681555a8 100644
--- a/plug-ins/common/guillotine.c
+++ b/plug-ins/common/guillotine.c
@@ -96,7 +96,8 @@ guillotine_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             guillotine_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
@@ -105,10 +106,12 @@ guillotine_create_procedure (GimpPlugIn  *plug_in,
       gimp_procedure_add_menu_path (procedure, "<Image>/Image/Crop");
 
       gimp_procedure_set_documentation (procedure,
-                                        N_("Slice the image into subimages using guides"),
-                                        "This function takes an image and slices it along "
-                                        "its guides, creating new images. The original "
-                                        "image is not modified.",
+                                        N_("Slice the image into subimages "
+                                           "using guides"),
+                                        "This function takes an image and "
+                                        "slices it along its guides, creating "
+                                        "new images. The original image is "
+                                        "not modified.",
                                         name);
       gimp_procedure_set_attribution (procedure,
                                       "Adam D. Moss (adam foxbox org)",
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index 58b188c28c..82850cc97d 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -362,7 +362,7 @@ query (void)
                           "May 2000",
                           N_("_Jigsaw..."),
                           "RGB*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c
index 6727054b44..aba836c7fb 100644
--- a/plug-ins/common/mail.c
+++ b/plug-ins/common/mail.c
@@ -187,7 +187,8 @@ mail_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             mail_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index a92eb4dca9..20cbceac3a 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -128,7 +128,7 @@ query (void)
                           "1997",
                           N_("_NL Filter..."),
                           "RGB,GRAY",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index 18cf1ab5b1..506e7715e6 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -161,7 +161,8 @@ browser_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (procedure_name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, procedure_name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, procedure_name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       browser_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("_Plug-In Browser"));
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index 3ec8537d21..b4d4ef73d9 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -117,7 +117,8 @@ browser_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       browser_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Procedure _Browser"));
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index 1107cde4cd..a940e29cef 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -183,7 +183,7 @@ query (void)
                           "Version 1.27, September 2003",
                           N_("_Sparkle..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index 49e7e54304..9942b2899c 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -175,7 +175,8 @@ editor_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       editor_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("U_nits"));
diff --git a/plug-ins/common/wavelet-decompose.c b/plug-ins/common/wavelet-decompose.c
index efa673043d..6830647e80 100644
--- a/plug-ins/common/wavelet-decompose.c
+++ b/plug-ins/common/wavelet-decompose.c
@@ -118,7 +118,8 @@ wavelet_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             wavelet_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*");
diff --git a/plug-ins/common/web-browser.c b/plug-ins/common/web-browser.c
index eabf07ec5f..8fa4179a18 100644
--- a/plug-ins/common/web-browser.c
+++ b/plug-ins/common/web-browser.c
@@ -108,7 +108,8 @@ browser_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       browser_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index f3e37c4e4c..ab7f656581 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -121,7 +121,8 @@ webpage_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       webpage_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("From _Webpage..."));
diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c
index 8b860a29aa..7be63e2c3b 100644
--- a/plug-ins/file-bmp/bmp.c
+++ b/plug-ins/file-bmp/bmp.c
@@ -142,7 +142,8 @@ bmp_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            bmp_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Windows BMP image"));
@@ -165,7 +166,8 @@ bmp_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            bmp_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, GRAY, RGB*");
diff --git a/plug-ins/file-dds/dds.c b/plug-ins/file-dds/dds.c
index 0a0b4facf4..f7d7949349 100644
--- a/plug-ins/file-dds/dds.c
+++ b/plug-ins/file-dds/dds.c
@@ -148,7 +148,8 @@ dds_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            dds_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("DDS image"));
@@ -183,7 +184,8 @@ dds_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            dds_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, GRAY, RGB");
@@ -299,7 +301,8 @@ dds_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, DECODE_YCOCG_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             dds_decode, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGBA");
@@ -318,7 +321,8 @@ dds_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, DECODE_YCOCG_SCALED_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             dds_decode, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGBA");
@@ -339,7 +343,8 @@ dds_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, DECODE_ALPHA_EXP_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             dds_decode, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGBA");
diff --git a/plug-ins/file-exr/file-exr.c b/plug-ins/file-exr/file-exr.c
index 5cc5665d9a..d3cab72a76 100644
--- a/plug-ins/file-exr/file-exr.c
+++ b/plug-ins/file-exr/file-exr.c
@@ -97,7 +97,8 @@ exr_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            exr_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("OpenEXR image"));
diff --git a/plug-ins/file-faxg3/faxg3.c b/plug-ins/file-faxg3/faxg3.c
index eca080bcb1..805907d97a 100644
--- a/plug-ins/file-faxg3/faxg3.c
+++ b/plug-ins/file-faxg3/faxg3.c
@@ -124,7 +124,8 @@ faxg3_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            faxg3_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("G3 fax image"));
diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c
index 71b2db61f9..3b9b157255 100644
--- a/plug-ins/file-fits/fits.c
+++ b/plug-ins/file-fits/fits.c
@@ -186,7 +186,8 @@ fits_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            fits_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure,
@@ -211,7 +212,8 @@ fits_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            fits_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB, GRAY, INDEXED");
diff --git a/plug-ins/file-fli/fli-gimp.c b/plug-ins/file-fli/fli-gimp.c
index 0da7aea8d2..8aa865562f 100644
--- a/plug-ins/file-fli/fli-gimp.c
+++ b/plug-ins/file-fli/fli-gimp.c
@@ -173,7 +173,8 @@ fli_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            fli_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("AutoDesk FLIC animation"));
@@ -207,7 +208,8 @@ fli_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            fli_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "INDEXED, GRAY");
@@ -243,7 +245,8 @@ fli_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, INFO_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       fli_info, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/file-ico/ico.c b/plug-ins/file-ico/ico.c
index 87b7e3796a..376a0b1603 100644
--- a/plug-ins/file-ico/ico.c
+++ b/plug-ins/file-ico/ico.c
@@ -119,7 +119,8 @@ ico_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            ico_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Microsoft Windows icon"));
@@ -146,7 +147,8 @@ ico_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 ico_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -160,7 +162,8 @@ ico_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            ico_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index 7e9373df6f..a24cf8687c 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -128,7 +128,8 @@ jpeg_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            jpeg_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("JPEG image"));
@@ -154,7 +155,8 @@ jpeg_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 jpeg_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -171,7 +173,8 @@ jpeg_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            jpeg_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "RGB*, GRAY*");
diff --git a/plug-ins/file-psd/psd.c b/plug-ins/file-psd/psd.c
index 1448025369..15e65131a5 100644
--- a/plug-ins/file-psd/psd.c
+++ b/plug-ins/file-psd/psd.c
@@ -115,7 +115,8 @@ psd_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            psd_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Photoshop image"));
@@ -143,7 +144,8 @@ psd_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_MERGED_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            psd_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("Photoshop image (merged)"));
@@ -173,7 +175,8 @@ psd_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 psd_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -190,7 +193,8 @@ psd_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            psd_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/file-raw/file-darktable.c b/plug-ins/file-raw/file-darktable.c
index 20c859944c..651afe11e8 100644
--- a/plug-ins/file-raw/file-darktable.c
+++ b/plug-ins/file-raw/file-darktable.c
@@ -226,7 +226,8 @@ darktable_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 darktable_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -263,7 +264,8 @@ 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_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_load_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                darktable_load,
                                                (gpointer) format, NULL);
 
diff --git a/plug-ins/file-raw/file-raw-placeholder.c b/plug-ins/file-raw/file-raw-placeholder.c
index 586f4236a1..257bbad2f5 100644
--- a/plug-ins/file-raw/file-raw-placeholder.c
+++ b/plug-ins/file-raw/file-raw-placeholder.c
@@ -124,7 +124,8 @@ 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_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            placeholder_load,
                                            (gpointer) format, NULL);
 
diff --git a/plug-ins/file-raw/file-rawtherapee.c b/plug-ins/file-raw/file-rawtherapee.c
index decb2bdec8..55fa634e07 100644
--- a/plug-ins/file-raw/file-rawtherapee.c
+++ b/plug-ins/file-raw/file-rawtherapee.c
@@ -177,7 +177,8 @@ rawtherapee_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_THUMB_PROC))
     {
-      procedure = gimp_thumbnail_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_thumbnail_procedure_new (plug_in, name,
+                                                GIMP_PDB_PROC_TYPE_PLUGIN,
                                                 rawtherapee_load_thumb, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -214,7 +215,8 @@ 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_new (plug_in, name, GIMP_PLUGIN,
+          procedure = gimp_load_procedure_new (plug_in, name,
+                                               GIMP_PDB_PROC_TYPE_PLUGIN,
                                                rawtherapee_load,
                                                (gpointer) format, NULL);
 
diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c
index f320b97645..a06e999f7a 100644
--- a/plug-ins/file-sgi/sgi.c
+++ b/plug-ins/file-sgi/sgi.c
@@ -134,7 +134,8 @@ sgi_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            sgi_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure,
@@ -158,7 +159,8 @@ sgi_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            sgi_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/file-tiff/file-tiff.c b/plug-ins/file-tiff/file-tiff.c
index 95b500cbc6..7fbf91a0d4 100644
--- a/plug-ins/file-tiff/file-tiff.c
+++ b/plug-ins/file-tiff/file-tiff.c
@@ -154,7 +154,8 @@ tiff_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            tiff_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("TIFF image"));
@@ -179,7 +180,8 @@ tiff_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            tiff_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/file-webp/file-webp.c b/plug-ins/file-webp/file-webp.c
index 43de2d0081..9c0758eae0 100644
--- a/plug-ins/file-webp/file-webp.c
+++ b/plug-ins/file-webp/file-webp.c
@@ -111,7 +111,8 @@ webp_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, LOAD_PROC))
     {
-      procedure = gimp_load_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_load_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            webp_load, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("WebP image"));
@@ -135,7 +136,8 @@ webp_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, SAVE_PROC))
     {
-      procedure = gimp_save_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_save_procedure_new (plug_in, name,
+                                           GIMP_PDB_PROC_TYPE_PLUGIN,
                                            webp_save, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 37e3e45857..6cccd00ff4 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -133,7 +133,7 @@ query (void)
                           "1997",
                           N_("_Flame..."),
                           "RGB*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/fractal-explorer/fractal-explorer.c b/plug-ins/fractal-explorer/fractal-explorer.c
index 9e73a024ab..d15932dfd9 100644
--- a/plug-ins/fractal-explorer/fractal-explorer.c
+++ b/plug-ins/fractal-explorer/fractal-explorer.c
@@ -227,7 +227,8 @@ explorer_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      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*");
diff --git a/plug-ins/gfig/gfig.c b/plug-ins/gfig/gfig.c
index bcdc0a7fc0..a6053cd187 100644
--- a/plug-ins/gfig/gfig.c
+++ b/plug-ins/gfig/gfig.c
@@ -154,7 +154,8 @@ gfig_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      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*");
diff --git a/plug-ins/gimpressionist/gimp.c b/plug-ins/gimpressionist/gimp.c
index fea302d383..05b215e9fa 100644
--- a/plug-ins/gimpressionist/gimp.c
+++ b/plug-ins/gimpressionist/gimp.c
@@ -93,7 +93,7 @@ query (void)
                           PLUG_IN_VERSION,
                           N_("_GIMPressionist..."),
                           "RGB*, GRAY*",
-                          GIMP_PLUGIN,
+                          GIMP_PDB_PROC_TYPE_PLUGIN,
                           G_N_ELEMENTS (args), 0,
                           args, NULL);
 
diff --git a/plug-ins/goat-exercises/goat-exercise-c.c b/plug-ins/goat-exercises/goat-exercise-c.c
index 1ec6354171..be9cdc0bab 100644
--- a/plug-ins/goat-exercises/goat-exercise-c.c
+++ b/plug-ins/goat-exercises/goat-exercise-c.c
@@ -102,7 +102,8 @@ goat_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             goat_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/help-browser/help-browser.c b/plug-ins/help-browser/help-browser.c
index 8ded94cd2b..be00b00c98 100644
--- a/plug-ins/help-browser/help-browser.c
+++ b/plug-ins/help-browser/help-browser.c
@@ -115,7 +115,8 @@ help_browser_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, GIMP_HELP_BROWSER_EXT_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_EXTENSION,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_EXTENSION,
                                       help_browser_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -200,7 +201,7 @@ temp_proc_install (GimpPlugIn *plug_in)
   GimpProcedure *procedure;
 
   procedure = gimp_procedure_new (plug_in, GIMP_HELP_BROWSER_TEMP_EXT_PROC,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   temp_proc_run, NULL, NULL);
 
   gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/help/help.c b/plug-ins/help/help.c
index af2f944920..dd6678f678 100644
--- a/plug-ins/help/help.c
+++ b/plug-ins/help/help.c
@@ -126,7 +126,8 @@ help_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, GIMP_HELP_EXT_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_EXTENSION,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_EXTENSION,
                                       help_run, NULL, NULL);
 
       gimp_procedure_set_attribution (procedure,
@@ -207,7 +208,8 @@ help_temp_proc_install (GimpPlugIn *plug_in)
   GimpProcedure *procedure;
 
   procedure = gimp_procedure_new (plug_in, GIMP_HELP_TEMP_EXT_PROC,
-                                  GIMP_TEMPORARY, help_temp_run, NULL, NULL);
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
+                                  help_temp_run, NULL, NULL);
 
   gimp_procedure_set_attribution (procedure,
                                   "Sven Neumann <sven gimp org>, "
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index 4aa390b3a3..f7f2f82bc1 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -358,7 +358,8 @@ ifs_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             ifs_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index 1f80168e01..073fbf1be5 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -154,7 +154,8 @@ imap_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             imap_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/metadata/metadata-editor.c b/plug-ins/metadata/metadata-editor.c
index bc694c3912..1b5a658a67 100644
--- a/plug-ins/metadata/metadata-editor.c
+++ b/plug-ins/metadata/metadata-editor.c
@@ -423,7 +423,8 @@ metadata_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       metadata_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/metadata/metadata-viewer.c b/plug-ins/metadata/metadata-viewer.c
index 03225ad495..d6e6bdcf33 100644
--- a/plug-ins/metadata/metadata-viewer.c
+++ b/plug-ins/metadata/metadata-viewer.c
@@ -144,7 +144,8 @@ metadata_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       metadata_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index ccefe42ffe..6e161c26f8 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -217,7 +217,8 @@ pagecurl_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      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*");
diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c
index c6296b418b..85c0a431a3 100644
--- a/plug-ins/print/print.c
+++ b/plug-ins/print/print.c
@@ -151,7 +151,8 @@ print_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PRINT_PROC_NAME))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             print_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
@@ -174,7 +175,8 @@ print_create_procedure (GimpPlugIn  *plug_in,
 #ifndef EMBED_PAGE_SETUP
   else if (! strcmp (name, PAGE_SETUP_PROC_NAME))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             print_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");
@@ -519,7 +521,8 @@ print_temp_proc_install (GimpImage *image)
   gchar         *name    = print_temp_proc_name (image);
   GimpProcedure *procedure;
 
-  procedure = gimp_procedure_new (plug_in, name, GIMP_TEMPORARY,
+  procedure = gimp_procedure_new (plug_in, name,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   print_temp_proc_run, NULL, NULL);
 
   gimp_procedure_set_documentation (procedure,
diff --git a/plug-ins/screenshot/screenshot.c b/plug-ins/screenshot/screenshot.c
index 949c5a0a12..ec88a38430 100644
--- a/plug-ins/screenshot/screenshot.c
+++ b/plug-ins/screenshot/screenshot.c
@@ -142,7 +142,8 @@ screenshot_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       screenshot_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("_Screenshot..."));
diff --git a/plug-ins/script-fu/script-fu-script.c b/plug-ins/script-fu/script-fu-script.c
index cee356f530..f2bdd69522 100644
--- a/plug-ins/script-fu/script-fu-script.c
+++ b/plug-ins/script-fu/script-fu-script.c
@@ -183,7 +183,7 @@ script_fu_script_install_proc (GimpPlugIn  *plug_in,
     menu_label = script->menu_label;
 
   procedure = gimp_procedure_new (plug_in, script->name,
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   run_func, script, NULL);
 
   gimp_procedure_set_image_types (procedure, script->image_types);
diff --git a/plug-ins/script-fu/script-fu.c b/plug-ins/script-fu/script-fu.c
index bc51eeb78a..d90a65b35a 100644
--- a/plug-ins/script-fu/script-fu.c
+++ b/plug-ins/script-fu/script-fu.c
@@ -115,7 +115,8 @@ script_fu_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, "extension-script-fu"))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_EXTENSION,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_EXTENSION,
                                       script_fu_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -130,7 +131,8 @@ script_fu_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, "plug-in-script-fu-console"))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       script_fu_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("_Console"));
@@ -157,7 +159,8 @@ script_fu_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, "plug-in-script-fu-text-console"))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       script_fu_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -180,7 +183,8 @@ script_fu_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, "plug-in-script-fu-server"))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       script_fu_run, NULL, NULL);
 
       gimp_procedure_set_menu_label (procedure, N_("_Start Server..."));
@@ -232,7 +236,8 @@ script_fu_create_procedure (GimpPlugIn  *plug_in,
     }
   else if (! strcmp (name, "plug-in-script-fu-eval"))
     {
-      procedure = gimp_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_procedure_new (plug_in, name,
+                                      GIMP_PDB_PROC_TYPE_PLUGIN,
                                       script_fu_run, NULL, NULL);
 
       gimp_procedure_set_documentation (procedure,
@@ -414,7 +419,7 @@ script_fu_extension_init (GimpPlugIn *plug_in)
                                 N_("Alpha to _Logo"));
 
   procedure = gimp_procedure_new (plug_in, "script-fu-refresh",
-                                  GIMP_TEMPORARY,
+                                  GIMP_PDB_PROC_TYPE_TEMPORARY,
                                   script_fu_refresh_proc, NULL, NULL);
 
   gimp_procedure_set_menu_label (procedure, N_("_Refresh Scripts"));
diff --git a/plug-ins/selection-to-path/selection-to-path.c b/plug-ins/selection-to-path/selection-to-path.c
index 9447c3138d..709281a846 100644
--- a/plug-ins/selection-to-path/selection-to-path.c
+++ b/plug-ins/selection-to-path/selection-to-path.c
@@ -131,7 +131,8 @@ sel2path_create_procedure (GimpPlugIn  *plug_in,
 
   if (! strcmp (name, PLUG_IN_PROC))
     {
-      procedure = gimp_image_procedure_new (plug_in, name, GIMP_PLUGIN,
+      procedure = gimp_image_procedure_new (plug_in, name,
+                                            GIMP_PDB_PROC_TYPE_PLUGIN,
                                             sel2path_run, NULL, NULL);
 
       gimp_procedure_set_image_types (procedure, "*");


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