[gimp] libgimp: remove the drawable and vectors parasite PDB functions completely



commit 6818dae23e0c069f59d693dbf5e268086d1163e4
Author: Michael Natterer <mitch gimp org>
Date:   Sun Feb 13 17:39:44 2011 +0100

    libgimp: remove the drawable and vectors parasite PDB functions completely
    
    and simply add them to the list of "compat_procs" which have a
    replacement with identical signature. Move the libgimp C functions to
    non-generated files.

 app/pdb/gimp-pdb-compat.c     |   10 +-
 app/pdb/internal-procs.c      |    2 +-
 app/pdb/parasite-cmds.c       |  488 -----------------------------------------
 libgimp/gimpdrawable.c        |   66 ++++++
 libgimp/gimpdrawable.h        |   57 +++--
 libgimp/gimpparasite_pdb.c    |  279 -----------------------
 libgimp/gimpparasite_pdb.h    |   48 ++---
 libgimp/gimpvectors.c         |   74 ++++++
 libgimp/gimpvectors.h         |   37 ++--
 tools/pdbgen/pdb/parasite.pdb |  195 +----------------
 10 files changed, 221 insertions(+), 1035 deletions(-)
---
diff --git a/app/pdb/gimp-pdb-compat.c b/app/pdb/gimp-pdb-compat.c
index c976420..f644a70 100644
--- a/app/pdb/gimp-pdb-compat.c
+++ b/app/pdb/gimp-pdb-compat.c
@@ -441,6 +441,10 @@ gimp_pdb_compat_procs_register (GimpPDB           *pdb,
     { "gimp-drawable-set-linked",        "gimp-item-set-linked"            },
     { "gimp-drawable-get-tattoo",        "gimp-item-get-tattoo"            },
     { "gimp-drawable-set-tattoo",        "gimp-item-set-tattoo"            },
+    { "gimp-drawable-parasite-find",     "gimp-item-find-parasite"         },
+    { "gimp-drawable-parasite-attach",   "gimp-item-attach-parasite"       },
+    { "gimp-drawable-parasite-detach",   "gimp-item-detach-parasite"       },
+    { "gimp-drawable-parasite-list",     "gimp-item-list-parasites"        },
     { "gimp-vectors-is-valid",           "gimp-item-is-valid"              },
     { "gimp-vectors-get-image",          "gimp-item-get-image"             },
     { "gimp-vectors-get-name",           "gimp-item-get-name"              },
@@ -450,7 +454,11 @@ gimp_pdb_compat_procs_register (GimpPDB           *pdb,
     { "gimp-vectors-get-linked",         "gimp-item-get-linked"            },
     { "gimp-vectors-set-linked",         "gimp-item-set-linked"            },
     { "gimp-vectors-get-tattoo",         "gimp-item-get-tattoo"            },
-    { "gimp-vectors-set-tattoo",         "gimp-item-set-tattoo"            }
+    { "gimp-vectors-set-tattoo",         "gimp-item-set-tattoo"            },
+    { "gimp-vectors-parasite-find",      "gimp-item-find-parasite"         },
+    { "gimp-vectors-parasite-attach",    "gimp-item-attach-parasite"       },
+    { "gimp-vectors-parasite-detach",    "gimp-item-detach-parasite"       },
+    { "gimp-vectors-parasite-list",      "gimp-item-list-parasites"        }
   };
 
   g_return_if_fail (GIMP_IS_PDB (pdb));
diff --git a/app/pdb/internal-procs.c b/app/pdb/internal-procs.c
index d1f1ade..466694e 100644
--- a/app/pdb/internal-procs.c
+++ b/app/pdb/internal-procs.c
@@ -28,7 +28,7 @@
 #include "internal-procs.h"
 
 
-/* 650 procedures registered total */
+/* 642 procedures registered total */
 
 void
 internal_procs_init (GimpPDB *pdb)
diff --git a/app/pdb/parasite-cmds.c b/app/pdb/parasite-cmds.c
index 86747fe..723390e 100644
--- a/app/pdb/parasite-cmds.c
+++ b/app/pdb/parasite-cmds.c
@@ -26,10 +26,8 @@
 #include "pdb-types.h"
 
 #include "core/gimp-parasites.h"
-#include "core/gimpdrawable.h"
 #include "core/gimpimage.h"
 #include "core/gimpparamspecs.h"
-#include "vectors/gimpvectors.h"
 
 #include "gimppdb.h"
 #include "gimpprocedure.h"
@@ -249,238 +247,6 @@ image_parasite_list_invoker (GimpProcedure      *procedure,
   return return_vals;
 }
 
-static GValueArray *
-drawable_parasite_find_invoker (GimpProcedure      *procedure,
-                                Gimp               *gimp,
-                                GimpContext        *context,
-                                GimpProgress       *progress,
-                                const GValueArray  *args,
-                                GError            **error)
-{
-  gboolean success = TRUE;
-  GValueArray *return_vals;
-  GimpDrawable *drawable;
-  const gchar *name;
-  GimpParasite *parasite = NULL;
-
-  drawable = gimp_value_get_drawable (&args->values[0], gimp);
-  name = g_value_get_string (&args->values[1]);
-
-  if (success)
-    {
-      parasite = gimp_parasite_copy (gimp_item_parasite_find (GIMP_ITEM (drawable),
-                                                              name));
-
-      if (! parasite)
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    g_value_take_boxed (&return_vals->values[1], parasite);
-
-  return return_vals;
-}
-
-static GValueArray *
-drawable_parasite_attach_invoker (GimpProcedure      *procedure,
-                                  Gimp               *gimp,
-                                  GimpContext        *context,
-                                  GimpProgress       *progress,
-                                  const GValueArray  *args,
-                                  GError            **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  const GimpParasite *parasite;
-
-  drawable = gimp_value_get_drawable (&args->values[0], gimp);
-  parasite = g_value_get_boxed (&args->values[1]);
-
-  if (success)
-    {
-      gimp_item_parasite_attach (GIMP_ITEM (drawable), parasite, TRUE);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GValueArray *
-drawable_parasite_detach_invoker (GimpProcedure      *procedure,
-                                  Gimp               *gimp,
-                                  GimpContext        *context,
-                                  GimpProgress       *progress,
-                                  const GValueArray  *args,
-                                  GError            **error)
-{
-  gboolean success = TRUE;
-  GimpDrawable *drawable;
-  const gchar *name;
-
-  drawable = gimp_value_get_drawable (&args->values[0], gimp);
-  name = g_value_get_string (&args->values[1]);
-
-  if (success)
-    {
-      gimp_item_parasite_detach (GIMP_ITEM (drawable), name, TRUE);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GValueArray *
-drawable_parasite_list_invoker (GimpProcedure      *procedure,
-                                Gimp               *gimp,
-                                GimpContext        *context,
-                                GimpProgress       *progress,
-                                const GValueArray  *args,
-                                GError            **error)
-{
-  gboolean success = TRUE;
-  GValueArray *return_vals;
-  GimpDrawable *drawable;
-  gint32 num_parasites = 0;
-  gchar **parasites = NULL;
-
-  drawable = gimp_value_get_drawable (&args->values[0], gimp);
-
-  if (success)
-    {
-      parasites = gimp_item_parasite_list (GIMP_ITEM (drawable), &num_parasites);
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_int (&return_vals->values[1], num_parasites);
-      gimp_value_take_stringarray (&return_vals->values[2], parasites, num_parasites);
-    }
-
-  return return_vals;
-}
-
-static GValueArray *
-vectors_parasite_find_invoker (GimpProcedure      *procedure,
-                               Gimp               *gimp,
-                               GimpContext        *context,
-                               GimpProgress       *progress,
-                               const GValueArray  *args,
-                               GError            **error)
-{
-  gboolean success = TRUE;
-  GValueArray *return_vals;
-  GimpVectors *vectors;
-  const gchar *name;
-  GimpParasite *parasite = NULL;
-
-  vectors = gimp_value_get_vectors (&args->values[0], gimp);
-  name = g_value_get_string (&args->values[1]);
-
-  if (success)
-    {
-      parasite = gimp_parasite_copy (gimp_item_parasite_find (GIMP_ITEM (vectors),
-                                                              name));
-
-      if (! parasite)
-        success = FALSE;
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    g_value_take_boxed (&return_vals->values[1], parasite);
-
-  return return_vals;
-}
-
-static GValueArray *
-vectors_parasite_attach_invoker (GimpProcedure      *procedure,
-                                 Gimp               *gimp,
-                                 GimpContext        *context,
-                                 GimpProgress       *progress,
-                                 const GValueArray  *args,
-                                 GError            **error)
-{
-  gboolean success = TRUE;
-  GimpVectors *vectors;
-  const GimpParasite *parasite;
-
-  vectors = gimp_value_get_vectors (&args->values[0], gimp);
-  parasite = g_value_get_boxed (&args->values[1]);
-
-  if (success)
-    {
-      gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite, TRUE);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GValueArray *
-vectors_parasite_detach_invoker (GimpProcedure      *procedure,
-                                 Gimp               *gimp,
-                                 GimpContext        *context,
-                                 GimpProgress       *progress,
-                                 const GValueArray  *args,
-                                 GError            **error)
-{
-  gboolean success = TRUE;
-  GimpVectors *vectors;
-  const gchar *name;
-
-  vectors = gimp_value_get_vectors (&args->values[0], gimp);
-  name = g_value_get_string (&args->values[1]);
-
-  if (success)
-    {
-      gimp_item_parasite_detach (GIMP_ITEM (vectors), name, TRUE);
-    }
-
-  return gimp_procedure_get_return_values (procedure, success,
-                                           error ? *error : NULL);
-}
-
-static GValueArray *
-vectors_parasite_list_invoker (GimpProcedure      *procedure,
-                               Gimp               *gimp,
-                               GimpContext        *context,
-                               GimpProgress       *progress,
-                               const GValueArray  *args,
-                               GError            **error)
-{
-  gboolean success = TRUE;
-  GValueArray *return_vals;
-  GimpVectors *vectors;
-  gint32 num_parasites = 0;
-  gchar **parasites = NULL;
-
-  vectors = gimp_value_get_vectors (&args->values[0], gimp);
-
-  if (success)
-    {
-      parasites = gimp_item_parasite_list (GIMP_ITEM (vectors), &num_parasites);
-    }
-
-  return_vals = gimp_procedure_get_return_values (procedure, success,
-                                                  error ? *error : NULL);
-
-  if (success)
-    {
-      g_value_set_int (&return_vals->values[1], num_parasites);
-      gimp_value_take_stringarray (&return_vals->values[2], parasites, num_parasites);
-    }
-
-  return return_vals;
-}
-
 void
 register_parasite_procs (GimpPDB *pdb)
 {
@@ -715,258 +481,4 @@ register_parasite_procs (GimpPDB *pdb)
                                                                  GIMP_PARAM_READWRITE));
   gimp_pdb_register_procedure (pdb, procedure);
   g_object_unref (procedure);
-
-  /*
-   * gimp-drawable-parasite-find
-   */
-  procedure = gimp_procedure_new (drawable_parasite_find_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-drawable-parasite-find");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-drawable-parasite-find",
-                                     "Deprecated: Use 'gimp-item-find-parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-find-parasite' instead.",
-                                     "Jay Cox",
-                                     "Jay Cox",
-                                     "1998",
-                                     "gimp-item-find-parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The name of the parasite to find",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_parasite ("parasite",
-                                                             "parasite",
-                                                             "The found parasite",
-                                                             GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-drawable-parasite-attach
-   */
-  procedure = gimp_procedure_new (drawable_parasite_attach_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-drawable-parasite-attach");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-drawable-parasite-attach",
-                                     "Deprecated: Use 'gimp-item-attach-parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-attach-parasite' instead.",
-                                     "Jay Cox",
-                                     "Jay Cox",
-                                     "1998",
-                                     "gimp-item-attach-parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_parasite ("parasite",
-                                                         "parasite",
-                                                         "The parasite to attach to a drawable",
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-drawable-parasite-detach
-   */
-  procedure = gimp_procedure_new (drawable_parasite_detach_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-drawable-parasite-detach");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-drawable-parasite-detach",
-                                     "Deprecated: Use 'gimp-item-detach-parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-detach-parasite' instead.",
-                                     "Jay Cox",
-                                     "Jay Cox",
-                                     "1998",
-                                     "gimp-item-detach-parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The name of the parasite to detach from a drawable.",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-drawable-parasite-list
-   */
-  procedure = gimp_procedure_new (drawable_parasite_list_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-drawable-parasite-list");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-drawable-parasite-list",
-                                     "Deprecated: Use 'gimp-item-list-parasites' instead.",
-                                     "Deprecated: Use 'gimp-item-list-parasites' instead.",
-                                     "Marc Lehmann",
-                                     "Marc Lehmann",
-                                     "1999",
-                                     "gimp-item-list-parasites");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_drawable_id ("drawable",
-                                                            "drawable",
-                                                            "The drawable",
-                                                            pdb->gimp, FALSE,
-                                                            GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("num-parasites",
-                                                          "num parasites",
-                                                          "The number of attached parasites",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string_array ("parasites",
-                                                                 "parasites",
-                                                                 "The names of currently attached parasites",
-                                                                 GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-vectors-parasite-find
-   */
-  procedure = gimp_procedure_new (vectors_parasite_find_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-vectors-parasite-find");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-vectors-parasite-find",
-                                     "Deprecated: Use 'gimp-item-find-parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-find-parasite' instead.",
-                                     "Michael Natterer <mitch gimp org>",
-                                     "Michael Natterer",
-                                     "2006",
-                                     "gimp-item-find-parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The name of the parasite to find",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_parasite ("parasite",
-                                                             "parasite",
-                                                             "The found parasite",
-                                                             GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-vectors-parasite-attach
-   */
-  procedure = gimp_procedure_new (vectors_parasite_attach_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-vectors-parasite-attach");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-vectors-parasite-attach",
-                                     "Deprecated: Use 'gimp-item-attach--parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-attach--parasite' instead.",
-                                     "Michael Natterer <mitch gimp org>",
-                                     "Michael Natterer",
-                                     "2006",
-                                     "gimp-item-attach--parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_parasite ("parasite",
-                                                         "parasite",
-                                                         "The parasite to attach to a vectors object",
-                                                         GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-vectors-parasite-detach
-   */
-  procedure = gimp_procedure_new (vectors_parasite_detach_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-vectors-parasite-detach");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-vectors-parasite-detach",
-                                     "Deprecated: Use 'gimp-item-detach-parasite' instead.",
-                                     "Deprecated: Use 'gimp-item-detach-parasite' instead.",
-                                     "Michael Natterer <mitch gimp org>",
-                                     "Michael Natterer",
-                                     "2006",
-                                     "gimp-item-detach-parasite");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_string ("name",
-                                                       "name",
-                                                       "The name of the parasite to detach from a vectors object.",
-                                                       FALSE, FALSE, FALSE,
-                                                       NULL,
-                                                       GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
-
-  /*
-   * gimp-vectors-parasite-list
-   */
-  procedure = gimp_procedure_new (vectors_parasite_list_invoker);
-  gimp_object_set_static_name (GIMP_OBJECT (procedure),
-                               "gimp-vectors-parasite-list");
-  gimp_procedure_set_static_strings (procedure,
-                                     "gimp-vectors-parasite-list",
-                                     "Deprecated: Use 'gimp-item-list-parasites' instead.",
-                                     "Deprecated: Use 'gimp-item-list-parasites' instead.",
-                                     "Michael Natterer <mitch gimp org>",
-                                     "Michael Natterer",
-                                     "2006",
-                                     "gimp-item-list-parasites");
-  gimp_procedure_add_argument (procedure,
-                               gimp_param_spec_vectors_id ("vectors",
-                                                           "vectors",
-                                                           "The vectors object",
-                                                           pdb->gimp, FALSE,
-                                                           GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_int32 ("num-parasites",
-                                                          "num parasites",
-                                                          "The number of attached parasites",
-                                                          0, G_MAXINT32, 0,
-                                                          GIMP_PARAM_READWRITE));
-  gimp_procedure_add_return_value (procedure,
-                                   gimp_param_spec_string_array ("parasites",
-                                                                 "parasites",
-                                                                 "The names of currently attached parasites",
-                                                                 GIMP_PARAM_READWRITE));
-  gimp_pdb_register_procedure (pdb, procedure);
-  g_object_unref (procedure);
 }
diff --git a/libgimp/gimpdrawable.c b/libgimp/gimpdrawable.c
index 187603e..ebe71a7 100644
--- a/libgimp/gimpdrawable.c
+++ b/libgimp/gimpdrawable.c
@@ -544,6 +544,72 @@ gimp_drawable_set_tattoo (gint32 drawable_ID,
 }
 
 /**
+ * gimp_drawable_parasite_find:
+ * @drawable_ID: The drawable.
+ * @name: The name of the parasite to find.
+ *
+ * Deprecated: Use gimp_item_find_parasite() instead.
+ *
+ * Returns: The found parasite.
+ **/
+GimpParasite *
+gimp_drawable_parasite_find (gint32       drawable_ID,
+                             const gchar *name)
+{
+  return gimp_item_find_parasite (drawable_ID, name);
+}
+
+/**
+ * gimp_drawable_parasite_attach:
+ * @drawable_ID: The drawable.
+ * @parasite: The parasite to attach to a drawable.
+ *
+ * Deprecated: Use gimp_item_attach_parasite() instead.
+ *
+ * Returns: TRUE on success.
+ **/
+gboolean
+gimp_drawable_parasite_attach (gint32              drawable_ID,
+                               const GimpParasite *parasite)
+{
+  return gimp_item_attach_parasite (drawable_ID, parasite);
+}
+
+/**
+ * gimp_drawable_parasite_detach:
+ * @drawable_ID: The drawable.
+ * @name: The name of the parasite to detach from a drawable.
+ *
+ * Deprecated: Use gimp_item_detach_parasite() instead.
+ *
+ * Returns: TRUE on success.
+ **/
+gboolean
+gimp_drawable_parasite_detach (gint32       drawable_ID,
+                               const gchar *name)
+{
+  return gimp_item_detach_parasite (drawable_ID, name);
+}
+
+/**
+ * gimp_drawable_parasite_list:
+ * @drawable_ID: The drawable.
+ * @num_parasites: The number of attached parasites.
+ * @parasites: The names of currently attached parasites.
+ *
+ * Deprecated: Use gimp_item_list_parasites() instead.
+ *
+ * Returns: TRUE on success.
+ **/
+gboolean
+gimp_drawable_parasite_list (gint32    drawable_ID,
+                             gint     *num_parasites,
+                             gchar  ***parasites)
+{
+  return gimp_item_list_parasites (drawable_ID, num_parasites, parasites);
+}
+
+/**
  * gimp_drawable_attach_new_parasite:
  * @drawable_ID: the ID of the #GimpDrawable to attach the #GimpParasite to.
  * @name: the name of the #GimpParasite to create and attach.
diff --git a/libgimp/gimpdrawable.h b/libgimp/gimpdrawable.h
index 002a38f..4fa1539 100644
--- a/libgimp/gimpdrawable.h
+++ b/libgimp/gimpdrawable.h
@@ -69,30 +69,39 @@ guchar       * gimp_drawable_get_sub_thumbnail_data (gint32         drawable_ID,
                                                      gint          *bpp);
 
 #ifndef GIMP_DISABLE_DEPRECATED
-gboolean       gimp_drawable_is_valid               (gint32         drawable_ID);
-gboolean       gimp_drawable_is_layer               (gint32         drawable_ID);
-gboolean       gimp_drawable_is_text_layer          (gint32         drawable_ID);
-gboolean       gimp_drawable_is_layer_mask          (gint32         drawable_ID);
-gboolean       gimp_drawable_is_channel             (gint32         drawable_ID);
-gboolean       gimp_drawable_delete                 (gint32         drawable_ID);
-gint32         gimp_drawable_get_image              (gint32         drawable_ID);
-gchar*         gimp_drawable_get_name               (gint32         drawable_ID);
-gboolean       gimp_drawable_set_name               (gint32         drawable_ID,
-                                                     const gchar   *name);
-gboolean       gimp_drawable_get_visible            (gint32         drawable_ID);
-gboolean       gimp_drawable_set_visible            (gint32         drawable_ID,
-                                                     gboolean       visible);
-gboolean       gimp_drawable_get_linked             (gint32         drawable_ID);
-gboolean       gimp_drawable_set_linked             (gint32         drawable_ID,
-                                                     gboolean       linked);
-gint           gimp_drawable_get_tattoo             (gint32         drawable_ID);
-gboolean       gimp_drawable_set_tattoo             (gint32         drawable_ID,
-                                                     gint           tattoo);
-gboolean       gimp_drawable_attach_new_parasite    (gint32         drawable_ID,
-                                                     const gchar   *name,
-                                                     gint           flags,
-                                                     gint           size,
-                                                     gconstpointer  data);
+gboolean       gimp_drawable_is_valid               (gint32              drawable_ID);
+gboolean       gimp_drawable_is_layer               (gint32              drawable_ID);
+gboolean       gimp_drawable_is_text_layer          (gint32              drawable_ID);
+gboolean       gimp_drawable_is_layer_mask          (gint32              drawable_ID);
+gboolean       gimp_drawable_is_channel             (gint32              drawable_ID);
+gboolean       gimp_drawable_delete                 (gint32              drawable_ID);
+gint32         gimp_drawable_get_image              (gint32              drawable_ID);
+gchar*         gimp_drawable_get_name               (gint32              drawable_ID);
+gboolean       gimp_drawable_set_name               (gint32              drawable_ID,
+                                                     const gchar        *name);
+gboolean       gimp_drawable_get_visible            (gint32              drawable_ID);
+gboolean       gimp_drawable_set_visible            (gint32              drawable_ID,
+                                                     gboolean            visible);
+gboolean       gimp_drawable_get_linked             (gint32              drawable_ID);
+gboolean       gimp_drawable_set_linked             (gint32              drawable_ID,
+                                                     gboolean            linked);
+gint           gimp_drawable_get_tattoo             (gint32              drawable_ID);
+gboolean       gimp_drawable_set_tattoo             (gint32              drawable_ID,
+                                                     gint                tattoo);
+GimpParasite * gimp_drawable_parasite_find          (gint32              drawable_ID,
+                                                     const gchar        *name);
+gboolean       gimp_drawable_parasite_attach        (gint32              drawable_ID,
+                                                     const GimpParasite *parasite);
+gboolean       gimp_drawable_parasite_detach        (gint32              drawable_ID,
+                                                     const gchar        *name);
+gboolean       gimp_drawable_parasite_list          (gint32              drawable_ID,
+                                                     gint               *num_parasites,
+                                                     gchar            ***parasites);
+gboolean       gimp_drawable_attach_new_parasite    (gint32              drawable_ID,
+                                                     const gchar        *name,
+                                                     gint                flags,
+                                                     gint                size,
+                                                     gconstpointer       data);
 #endif /* GIMP_DISABLE_DEPRECATED */
 
 G_END_DECLS
diff --git a/libgimp/gimpparasite_pdb.c b/libgimp/gimpparasite_pdb.c
index 26d812f..bfdbd29 100644
--- a/libgimp/gimpparasite_pdb.c
+++ b/libgimp/gimpparasite_pdb.c
@@ -23,9 +23,6 @@
 #include "config.h"
 
 #include "gimp.h"
-#undef GIMP_DISABLE_DEPRECATED
-#undef __GIMP_PARASITE_PDB_H__
-#include "gimpparasite_pdb.h"
 
 
 /**
@@ -312,279 +309,3 @@ gimp_image_parasite_list (gint32    image_ID,
 
   return success;
 }
-
-/**
- * gimp_drawable_parasite_find:
- * @drawable_ID: The drawable.
- * @name: The name of the parasite to find.
- *
- * Deprecated: Use gimp_item_find_parasite() instead.
- *
- * Returns: The found parasite.
- **/
-GimpParasite *
-gimp_drawable_parasite_find (gint32       drawable_ID,
-                             const gchar *name)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  GimpParasite *parasite = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-drawable-parasite-find",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return parasite;
-}
-
-/**
- * gimp_drawable_parasite_attach:
- * @drawable_ID: The drawable.
- * @parasite: The parasite to attach to a drawable.
- *
- * Deprecated: Use gimp_item_attach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_attach (gint32              drawable_ID,
-                               const GimpParasite *parasite)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-drawable-parasite-attach",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_PARASITE, parasite,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_drawable_parasite_detach:
- * @drawable_ID: The drawable.
- * @name: The name of the parasite to detach from a drawable.
- *
- * Deprecated: Use gimp_item_detach_parasite() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_detach (gint32       drawable_ID,
-                               const gchar *name)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-drawable-parasite-detach",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_drawable_parasite_list:
- * @drawable_ID: The drawable.
- * @num_parasites: The number of attached parasites.
- * @parasites: The names of currently attached parasites.
- *
- * Deprecated: Use gimp_item_list_parasites() instead.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_drawable_parasite_list (gint32    drawable_ID,
-                             gint     *num_parasites,
-                             gchar  ***parasites)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-  gint i;
-
-  return_vals = gimp_run_procedure ("gimp-drawable-parasite-list",
-                                    &nreturn_vals,
-                                    GIMP_PDB_DRAWABLE, drawable_ID,
-                                    GIMP_PDB_END);
-
-  *num_parasites = 0;
-  *parasites = NULL;
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  if (success)
-    {
-      *num_parasites = return_vals[1].data.d_int32;
-      *parasites = g_new (gchar *, *num_parasites);
-      for (i = 0; i < *num_parasites; i++)
-        (*parasites)[i] = g_strdup (return_vals[2].data.d_stringarray[i]);
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_vectors_parasite_find:
- * @vectors_ID: The vectors object.
- * @name: The name of the parasite to find.
- *
- * Deprecated: Use gimp_item_find_parasite() instead.
- *
- * Returns: The found parasite.
- *
- * Since: GIMP 2.4
- **/
-GimpParasite *
-gimp_vectors_parasite_find (gint32       vectors_ID,
-                            const gchar *name)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  GimpParasite *parasite = NULL;
-
-  return_vals = gimp_run_procedure ("gimp-vectors-parasite-find",
-                                    &nreturn_vals,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  if (return_vals[0].data.d_status == GIMP_PDB_SUCCESS)
-    parasite = gimp_parasite_copy (&return_vals[1].data.d_parasite);
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return parasite;
-}
-
-/**
- * gimp_vectors_parasite_attach:
- * @vectors_ID: The vectors object.
- * @parasite: The parasite to attach to a vectors object.
- *
- * Deprecated: Use gimp_item_attach__parasite() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: GIMP 2.4
- **/
-gboolean
-gimp_vectors_parasite_attach (gint32              vectors_ID,
-                              const GimpParasite *parasite)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-vectors-parasite-attach",
-                                    &nreturn_vals,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_PARASITE, parasite,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_vectors_parasite_detach:
- * @vectors_ID: The vectors object.
- * @name: The name of the parasite to detach from a vectors object.
- *
- * Deprecated: Use gimp_item_detach_parasite() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: GIMP 2.4
- **/
-gboolean
-gimp_vectors_parasite_detach (gint32       vectors_ID,
-                              const gchar *name)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-
-  return_vals = gimp_run_procedure ("gimp-vectors-parasite-detach",
-                                    &nreturn_vals,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_STRING, name,
-                                    GIMP_PDB_END);
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
-
-/**
- * gimp_vectors_parasite_list:
- * @vectors_ID: The vectors object.
- * @num_parasites: The number of attached parasites.
- * @parasites: The names of currently attached parasites.
- *
- * Deprecated: Use gimp_item_list_parasites() instead.
- *
- * Returns: TRUE on success.
- *
- * Since: GIMP 2.4
- **/
-gboolean
-gimp_vectors_parasite_list (gint32    vectors_ID,
-                            gint     *num_parasites,
-                            gchar  ***parasites)
-{
-  GimpParam *return_vals;
-  gint nreturn_vals;
-  gboolean success = TRUE;
-  gint i;
-
-  return_vals = gimp_run_procedure ("gimp-vectors-parasite-list",
-                                    &nreturn_vals,
-                                    GIMP_PDB_VECTORS, vectors_ID,
-                                    GIMP_PDB_END);
-
-  *num_parasites = 0;
-  *parasites = NULL;
-
-  success = return_vals[0].data.d_status == GIMP_PDB_SUCCESS;
-
-  if (success)
-    {
-      *num_parasites = return_vals[1].data.d_int32;
-      *parasites = g_new (gchar *, *num_parasites);
-      for (i = 0; i < *num_parasites; i++)
-        (*parasites)[i] = g_strdup (return_vals[2].data.d_stringarray[i]);
-    }
-
-  gimp_destroy_params (return_vals, nreturn_vals);
-
-  return success;
-}
diff --git a/libgimp/gimpparasite_pdb.h b/libgimp/gimpparasite_pdb.h
index 6fb0520..43043aa 100644
--- a/libgimp/gimpparasite_pdb.h
+++ b/libgimp/gimpparasite_pdb.h
@@ -28,40 +28,20 @@ G_BEGIN_DECLS
 /* For information look into the C source or the html documentation */
 
 
-GimpParasite* gimp_parasite_find            (const gchar          *name);
-gboolean      gimp_parasite_attach          (const GimpParasite   *parasite);
-gboolean      gimp_parasite_detach          (const gchar          *name);
-gboolean      gimp_parasite_list            (gint                 *num_parasites,
-                                             gchar              ***parasites);
-GimpParasite* gimp_image_parasite_find      (gint32                image_ID,
-                                             const gchar          *name);
-gboolean      gimp_image_parasite_attach    (gint32                image_ID,
-                                             const GimpParasite   *parasite);
-gboolean      gimp_image_parasite_detach    (gint32                image_ID,
-                                             const gchar          *name);
-gboolean      gimp_image_parasite_list      (gint32                image_ID,
-                                             gint                 *num_parasites,
-                                             gchar              ***parasites);
-#ifndef GIMP_DISABLE_DEPRECATED
-GimpParasite* gimp_drawable_parasite_find   (gint32                drawable_ID,
-                                             const gchar          *name);
-gboolean      gimp_drawable_parasite_attach (gint32                drawable_ID,
-                                             const GimpParasite   *parasite);
-gboolean      gimp_drawable_parasite_detach (gint32                drawable_ID,
-                                             const gchar          *name);
-gboolean      gimp_drawable_parasite_list   (gint32                drawable_ID,
-                                             gint                 *num_parasites,
-                                             gchar              ***parasites);
-GimpParasite* gimp_vectors_parasite_find    (gint32                vectors_ID,
-                                             const gchar          *name);
-gboolean      gimp_vectors_parasite_attach  (gint32                vectors_ID,
-                                             const GimpParasite   *parasite);
-gboolean      gimp_vectors_parasite_detach  (gint32                vectors_ID,
-                                             const gchar          *name);
-gboolean      gimp_vectors_parasite_list    (gint32                vectors_ID,
-                                             gint                 *num_parasites,
-                                             gchar              ***parasites);
-#endif /* GIMP_DISABLE_DEPRECATED */
+GimpParasite* gimp_parasite_find         (const gchar          *name);
+gboolean      gimp_parasite_attach       (const GimpParasite   *parasite);
+gboolean      gimp_parasite_detach       (const gchar          *name);
+gboolean      gimp_parasite_list         (gint                 *num_parasites,
+                                          gchar              ***parasites);
+GimpParasite* gimp_image_parasite_find   (gint32                image_ID,
+                                          const gchar          *name);
+gboolean      gimp_image_parasite_attach (gint32                image_ID,
+                                          const GimpParasite   *parasite);
+gboolean      gimp_image_parasite_detach (gint32                image_ID,
+                                          const gchar          *name);
+gboolean      gimp_image_parasite_list   (gint32                image_ID,
+                                          gint                 *num_parasites,
+                                          gchar              ***parasites);
 
 
 G_END_DECLS
diff --git a/libgimp/gimpvectors.c b/libgimp/gimpvectors.c
index 5ea2f6a..c03f1c5 100644
--- a/libgimp/gimpvectors.c
+++ b/libgimp/gimpvectors.c
@@ -195,3 +195,77 @@ gimp_vectors_set_tattoo (gint32 vectors_ID,
 {
   return gimp_vectors_set_tattoo (vectors_ID, tattoo);
 }
+
+/**
+ * gimp_vectors_parasite_find:
+ * @vectors_ID: The vectors object.
+ * @name: The name of the parasite to find.
+ *
+ * Deprecated: Use gimp_item_find_parasite() instead.
+ *
+ * Returns: The found parasite.
+ *
+ * Since: GIMP 2.4
+ **/
+GimpParasite *
+gimp_vectors_parasite_find (gint32       vectors_ID,
+                            const gchar *name)
+{
+  return gimp_item_find_parasite (vectors_ID, name);
+}
+
+/**
+ * gimp_vectors_parasite_attach:
+ * @vectors_ID: The vectors object.
+ * @parasite: The parasite to attach to a vectors object.
+ *
+ * Deprecated: Use gimp_item_attach_parasite() instead.
+ *
+ * Returns: TRUE on success.
+ *
+ * Since: GIMP 2.4
+ **/
+gboolean
+gimp_vectors_parasite_attach (gint32              vectors_ID,
+                              const GimpParasite *parasite)
+{
+  return gimp_item_attach_parasite (vectors_ID, parasite);
+}
+
+/**
+ * gimp_vectors_parasite_detach:
+ * @vectors_ID: The vectors object.
+ * @name: The name of the parasite to detach from a vectors object.
+ *
+ * Deprecated: Use gimp_item_detach_parasite() instead.
+ *
+ * Returns: TRUE on success.
+ *
+ * Since: GIMP 2.4
+ **/
+gboolean
+gimp_vectors_parasite_detach (gint32       vectors_ID,
+                              const gchar *name)
+{
+  return gimp_item_detach_parasite (vectors_ID, name);
+}
+
+/**
+ * gimp_vectors_parasite_list:
+ * @vectors_ID: The vectors object.
+ * @num_parasites: The number of attached parasites.
+ * @parasites: The names of currently attached parasites.
+ *
+ * Deprecated: Use gimp_item_list_parasites() instead.
+ *
+ * Returns: TRUE on success.
+ *
+ * Since: GIMP 2.4
+ **/
+gboolean
+gimp_vectors_parasite_list (gint32    vectors_ID,
+                            gint     *num_parasites,
+                            gchar  ***parasites)
+{
+  return gimp_item_list_parasites (vectors_ID, num_parasites, parasites);
+}
diff --git a/libgimp/gimpvectors.h b/libgimp/gimpvectors.h
index 920abc4..3210ba5 100644
--- a/libgimp/gimpvectors.h
+++ b/libgimp/gimpvectors.h
@@ -27,20 +27,29 @@ G_BEGIN_DECLS
 
 
 #ifndef GIMP_DISABLE_DEPRECATED
-gboolean   gimp_vectors_is_valid    (gint32       vectors_ID);
-gint32     gimp_vectors_get_image   (gint32       vectors_ID);
-gchar    * gimp_vectors_get_name    (gint32       vectors_ID);
-gboolean   gimp_vectors_set_name    (gint32       vectors_ID,
-                                     const gchar *name);
-gboolean   gimp_vectors_get_visible (gint32       vectors_ID);
-gboolean   gimp_vectors_set_visible (gint32       vectors_ID,
-                                     gboolean     visible);
-gboolean   gimp_vectors_get_linked  (gint32       vectors_ID);
-gboolean   gimp_vectors_set_linked  (gint32       vectors_ID,
-                                     gboolean     linked);
-gint       gimp_vectors_get_tattoo  (gint32       vectors_ID);
-gboolean   gimp_vectors_set_tattoo  (gint32       vectors_ID,
-                                     gint         tattoo);
+gboolean       gimp_vectors_is_valid        (gint32              vectors_ID);
+gint32         gimp_vectors_get_image       (gint32              vectors_ID);
+gchar        * gimp_vectors_get_name        (gint32              vectors_ID);
+gboolean       gimp_vectors_set_name        (gint32              vectors_ID,
+                                             const gchar        *name);
+gboolean       gimp_vectors_get_visible     (gint32              vectors_ID);
+gboolean       gimp_vectors_set_visible     (gint32              vectors_ID,
+                                             gboolean            visible);
+gboolean       gimp_vectors_get_linked      (gint32              vectors_ID);
+gboolean       gimp_vectors_set_linked      (gint32              vectors_ID,
+                                             gboolean            linked);
+gint           gimp_vectors_get_tattoo      (gint32              vectors_ID);
+gboolean       gimp_vectors_set_tattoo      (gint32              vectors_ID,
+                                             gint                tattoo);
+GimpParasite * gimp_vectors_parasite_find   (gint32              vectors_ID,
+                                             const gchar        *name);
+gboolean       gimp_vectors_parasite_attach (gint32              vectors_ID,
+                                             const GimpParasite *parasite);
+gboolean       gimp_vectors_parasite_detach (gint32              vectors_ID,
+                                             const gchar        *name);
+gboolean       gimp_vectors_parasite_list   (gint32              vectors_ID,
+                                             gint               *num_parasites,
+                                             gchar            ***parasites);
 #endif /* GIMP_DISABLE_DEPRECATED */
 
 G_END_DECLS
diff --git a/tools/pdbgen/pdb/parasite.pdb b/tools/pdbgen/pdb/parasite.pdb
index 00777c3..7323320 100644
--- a/tools/pdbgen/pdb/parasite.pdb
+++ b/tools/pdbgen/pdb/parasite.pdb
@@ -223,193 +223,6 @@ CODE
     );
 }
 
-sub drawable_parasite_find {
-    &std_pdb_deprecated ('gimp-item-find-parasite');
-    &jay_pdb_misc('1998');
-
-    @inargs = (
-	{ name => 'drawable', type => 'drawable',
-	  desc => 'The drawable' },
-	{ name => 'name', type => 'string',
-	  desc => 'The name of the parasite to find' }
-    );
-
-    @outargs = (
-	{ name => 'parasite', type => 'parasite',
-	  desc => 'The found parasite' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  parasite = gimp_parasite_copy (gimp_item_parasite_find (GIMP_ITEM (drawable),
-                                                          name));
-
-  if (! parasite)
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub drawable_parasite_attach {
-    &std_pdb_deprecated ('gimp-item-attach-parasite');
-    &jay_pdb_misc('1998');
-
-    @inargs = (
-	{ name => 'drawable', type => 'drawable',
-	  desc => 'The drawable' },
-	{ name => 'parasite', type => 'parasite',
-	  desc => 'The parasite to attach to a drawable' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  gimp_item_parasite_attach (GIMP_ITEM (drawable), parasite, TRUE);
-}
-CODE
-    );
-}
-
-sub drawable_parasite_detach {
-    &std_pdb_deprecated ('gimp-item-detach-parasite');
-    &jay_pdb_misc('1998');
-
-    @inargs = (
-	{ name => 'drawable', type => 'drawable',
-	  desc => 'The drawable' },
-	{ name => 'name', type => 'string',
-	  desc => 'The name of the parasite to detach from a drawable.' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  gimp_item_parasite_detach (GIMP_ITEM (drawable), name, TRUE);
-}
-CODE
-    );
-}
-
-sub drawable_parasite_list {
-    &std_pdb_deprecated ('gimp-item-list-parasites');
-    &marc_pdb_misc('1999');
-
-    @inargs = (
-	{ name => 'drawable', type => 'drawable',
-	  desc => 'The drawable' }
-    );
-
-    @outargs = (
-	{ name => 'parasites', type => 'stringarray', void_ret => 1,
-	  desc => 'The names of currently attached parasites',
-	  array => { desc => 'The number of attached parasites' } }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  parasites = gimp_item_parasite_list (GIMP_ITEM (drawable), &num_parasites);
-}
-CODE
-    );
-}
-
-sub vectors_parasite_find {
-    &std_pdb_deprecated ('gimp-item-find-parasite');
-    &mitch_pdb_misc('2006', '2.4');
-
-    @inargs = (
-	{ name => 'vectors', type => 'vectors',
-	  desc => 'The vectors object' },
-	{ name => 'name', type => 'string',
-	  desc => 'The name of the parasite to find' }
-    );
-
-    @outargs = (
-	{ name => 'parasite', type => 'parasite',
-	  desc => 'The found parasite' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  parasite = gimp_parasite_copy (gimp_item_parasite_find (GIMP_ITEM (vectors),
-                                                          name));
-
-  if (! parasite)
-    success = FALSE;
-}
-CODE
-    );
-}
-
-sub vectors_parasite_attach {
-    &std_pdb_deprecated ('gimp-item-attach--parasite');
-    &mitch_pdb_misc('2006', '2.4');
-
-    @inargs = (
-	{ name => 'vectors', type => 'vectors',
-	  desc => 'The vectors object' },
-	{ name => 'parasite', type => 'parasite',
-	  desc => 'The parasite to attach to a vectors object' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite, TRUE);
-}
-CODE
-    );
-}
-
-sub vectors_parasite_detach {
-    &std_pdb_deprecated ('gimp-item-detach-parasite');
-    &mitch_pdb_misc('2006', '2.4');
-
-    @inargs = (
-	{ name => 'vectors', type => 'vectors',
-	  desc => 'The vectors object' },
-	{ name => 'name', type => 'string',
-	  desc => 'The name of the parasite to detach from a vectors object.' }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  gimp_item_parasite_detach (GIMP_ITEM (vectors), name, TRUE);
-}
-CODE
-    );
-}
-
-sub vectors_parasite_list {
-    &std_pdb_deprecated ('gimp-item-list-parasites');
-    &mitch_pdb_misc('2006', '2.4');
-
-    @inargs = (
-	{ name => 'vectors', type => 'vectors',
-	  desc => 'The vectors object' }
-    );
-
-    @outargs = (
-	{ name => 'parasites', type => 'stringarray', void_ret => 1,
-	  desc => 'The names of currently attached parasites',
-	  array => { desc => 'The number of attached parasites' } }
-    );
-
-    %invoke = (
-	code => <<'CODE'
-{
-  parasites = gimp_item_parasite_list (GIMP_ITEM (vectors), &num_parasites);
-}
-CODE
-    );
-}
-
-
 @headers = qw("core/gimp-parasites.h");
 
 @procs = qw(parasite_find
@@ -417,13 +230,7 @@ CODE
             parasite_list
 	    image_parasite_find
 	    image_parasite_attach image_parasite_detach
-	    image_parasite_list
-	    drawable_parasite_find
-	    drawable_parasite_attach drawable_parasite_detach
-	    drawable_parasite_list
-	    vectors_parasite_find
-	    vectors_parasite_attach vectors_parasite_detach
-	    vectors_parasite_list);
+	    image_parasite_list);
 
 %exports = (app => [ procs], lib => [ procs]);
 



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