[gimp] libgimp: move most old gimp_pdb functions to gimplegacy.[ch]
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimp: move most old gimp_pdb functions to gimplegacy.[ch]
- Date: Tue, 6 Aug 2019 22:28:07 +0000 (UTC)
commit 7b58cb1d286c222dbfd79b71b1c48efe656821a0
Author: Michael Natterer <mitch gimp org>
Date: Wed Aug 7 00:27:34 2019 +0200
libgimp: move most old gimp_pdb functions to gimplegacy.[ch]
libgimp/gimplegacy.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++++-
libgimp/gimplegacy.h | 27 ++++++++
libgimp/gimppdb.c | 179 -------------------------------------------------
libgimp/gimppdb.h | 24 -------
4 files changed, 212 insertions(+), 204 deletions(-)
---
diff --git a/libgimp/gimplegacy.c b/libgimp/gimplegacy.c
index 82000f4b79..d9d7b1a112 100644
--- a/libgimp/gimplegacy.c
+++ b/libgimp/gimplegacy.c
@@ -1002,7 +1002,8 @@ _gimp_legacy_quit (void)
gp_quit_write (_gimp_writechannel, NULL);
}
-/* old gimp_plugin cruft */
+
+/* cruft from other places */
/**
* gimp_plugin_domain_register:
@@ -1151,6 +1152,189 @@ gimp_plugin_icon_register (const gchar *procedure_name,
icon_type, icon_data_length, icon_data);
}
+/**
+ * gimp_pdb_temp_name:
+ *
+ * Generates a unique temporary PDB name.
+ *
+ * This procedure generates a temporary PDB entry name that is
+ * guaranteed to be unique.
+ *
+ * Returns: (transfer full): A unique temporary name for a temporary PDB entry.
+ * The returned value must be freed with g_free().
+ **/
+gchar *
+gimp_pdb_temp_name (void)
+{
+ ASSERT_NO_PLUG_IN_EXISTS (G_STRFUNC);
+
+ return _gimp_pdb_temp_name ();
+}
+
+/**
+ * gimp_pdb_proc_exists:
+ * @procedure_name: The procedure name.
+ *
+ * Checks if the specified procedure exists in the procedural database
+ *
+ * This procedure checks if the specified procedure is registered in
+ * the procedural database.
+ *
+ * Returns: Whether a procedure of that name is registered.
+ *
+ * Since: 2.6
+ **/
+gboolean
+gimp_pdb_proc_exists (const gchar *procedure_name)
+{
+ ASSERT_NO_PLUG_IN_EXISTS (G_STRFUNC);
+
+ return _gimp_pdb_proc_exists (procedure_name);
+}
+
+/**
+ * gimp_pdb_proc_info:
+ * @procedure: The procedure name.
+ * @blurb: A short blurb.
+ * @help: Detailed procedure help.
+ * @author: Author(s) of the procedure.
+ * @copyright: The copyright.
+ * @date: Copyright date.
+ * @proc_type: The procedure type.
+ * @num_args: The number of input arguments.
+ * @num_values: The number of return values.
+ * @args: The input arguments.
+ * @return_vals: The return values.
+ *
+ * Queries the procedural database for information on the specified
+ * procedure.
+ *
+ * This procedure returns information on the specified procedure. A
+ * short blurb, detailed help, author(s), copyright information,
+ * procedure type, number of input, and number of return values are
+ * returned. Additionally this function returns specific information
+ * about each input argument and return value.
+ *
+ * Returns: TRUE on success.
+ */
+gboolean
+gimp_pdb_proc_info (const gchar *procedure_name,
+ gchar **blurb,
+ gchar **help,
+ gchar **author,
+ gchar **copyright,
+ gchar **date,
+ GimpPDBProcType *proc_type,
+ gint *num_args,
+ gint *num_values,
+ GimpParamDef **args,
+ GimpParamDef **return_vals)
+{
+ gint i;
+ gboolean success = TRUE;
+
+ success = _gimp_pdb_proc_info (procedure_name,
+ blurb,
+ help,
+ author,
+ copyright,
+ date,
+ proc_type,
+ num_args,
+ num_values);
+
+ if (success)
+ {
+ *args = g_new (GimpParamDef, *num_args);
+ *return_vals = g_new (GimpParamDef, *num_values);
+
+ for (i = 0; i < *num_args; i++)
+ {
+ if (! gimp_pdb_proc_arg (procedure_name, i,
+ &(*args)[i].type,
+ &(*args)[i].name,
+ &(*args)[i].description))
+ {
+ g_free (*args);
+ g_free (*return_vals);
+
+ return FALSE;
+ }
+ }
+
+ for (i = 0; i < *num_values; i++)
+ {
+ if (! gimp_pdb_proc_val (procedure_name, i,
+ &(*return_vals)[i].type,
+ &(*return_vals)[i].name,
+ &(*return_vals)[i].description))
+ {
+ g_free (*args);
+ g_free (*return_vals);
+
+ return FALSE;
+ }
+ }
+ }
+
+ return success;
+}
+
+/**
+ * gimp_pdb_proc_arg:
+ * @procedure_name: The procedure name.
+ * @arg_num: The argument number.
+ * @arg_type: (out): The type of argument.
+ * @arg_name: (out) (transfer full): The name of the argument.
+ * @arg_desc: (out) (transfer full): A description of the argument.
+ *
+ * Queries the procedural database for information on the specified
+ * procedure's argument.
+ *
+ * This procedure returns information on the specified procedure's
+ * argument. The argument type, name, and a description are retrieved.
+ *
+ * Returns: TRUE on success.
+ **/
+gboolean
+gimp_pdb_proc_arg (const gchar *procedure_name,
+ gint arg_num,
+ GimpPDBArgType *arg_type,
+ gchar **arg_name,
+ gchar **arg_desc)
+{
+ return _gimp_pdb_proc_arg (procedure_name, arg_num,
+ arg_type, arg_name, arg_desc);
+}
+
+/**
+ * gimp_pdb_proc_val:
+ * @procedure_name: The procedure name.
+ * @val_num: The return value number.
+ * @val_type: (out): The type of return value.
+ * @val_name: (out) (transfer full): The name of the return value.
+ * @val_desc: (out) (transfer full): A description of the return value.
+ *
+ * Queries the procedural database for information on the specified
+ * procedure's return value.
+ *
+ * This procedure returns information on the specified procedure's
+ * return value. The return value type, name, and a description are
+ * retrieved.
+ *
+ * Returns: TRUE on success.
+ **/
+gboolean
+gimp_pdb_proc_val (const gchar *procedure_name,
+ gint val_num,
+ GimpPDBArgType *val_type,
+ gchar **val_name,
+ gchar **val_desc)
+{
+ return _gimp_pdb_proc_val (procedure_name, val_num,
+ val_type, val_name, val_desc);
+}
+
/* private functions */
diff --git a/libgimp/gimplegacy.h b/libgimp/gimplegacy.h
index 473ada8e81..8b3900576b 100644
--- a/libgimp/gimplegacy.h
+++ b/libgimp/gimplegacy.h
@@ -305,6 +305,33 @@ gboolean gimp_plugin_icon_register (const gchar *procedure_name,
GimpIconType icon_type,
const guint8 *icon_data);
+/* pdb stuff that should now be done using GimpPDB
+ */
+
+gchar * gimp_pdb_temp_name (void);
+gboolean gimp_pdb_proc_exists (const gchar *procedure_name);
+gboolean gimp_pdb_proc_info (const gchar *procedure_name,
+ gchar **blurb,
+ gchar **help,
+ gchar **author,
+ gchar **copyright,
+ gchar **date,
+ GimpPDBProcType *proc_type,
+ gint *num_args,
+ gint *num_values,
+ GimpParamDef **args,
+ GimpParamDef **return_vals);
+gboolean gimp_pdb_proc_arg (const gchar *procedure_name,
+ gint arg_num,
+ GimpPDBArgType *arg_type,
+ gchar **arg_name,
+ gchar **arg_desc);
+gboolean gimp_pdb_proc_val (const gchar *procedure_name,
+ gint val_num,
+ GimpPDBArgType *val_type,
+ gchar **val_name,
+ gchar **val_desc);
+
#endif /* GIMP_DISABLE_COMPAT_CRUFT */
diff --git a/libgimp/gimppdb.c b/libgimp/gimppdb.c
index 26121b1371..6cfbb92c27 100644
--- a/libgimp/gimppdb.c
+++ b/libgimp/gimppdb.c
@@ -316,185 +316,6 @@ _gimp_pdb_error_quark (void)
/* Cruft API */
-/**
- * gimp_pdb_temp_name:
- *
- * Generates a unique temporary PDB name.
- *
- * This procedure generates a temporary PDB entry name that is
- * guaranteed to be unique.
- *
- * Returns: (transfer full): A unique temporary name for a temporary PDB entry.
- * The returned value must be freed with g_free().
- **/
-gchar *
-gimp_pdb_temp_name (void)
-{
- return _gimp_pdb_temp_name ();
-}
-
-/**
- * gimp_pdb_proc_exists:
- * @procedure_name: The procedure name.
- *
- * Checks if the specified procedure exists in the procedural database
- *
- * This procedure checks if the specified procedure is registered in
- * the procedural database.
- *
- * Returns: Whether a procedure of that name is registered.
- *
- * Since: 2.6
- **/
-gboolean
-gimp_pdb_proc_exists (const gchar *procedure_name)
-{
- return _gimp_pdb_proc_exists (procedure_name);
-}
-
-/**
- * gimp_pdb_proc_info:
- * @procedure: The procedure name.
- * @blurb: A short blurb.
- * @help: Detailed procedure help.
- * @author: Author(s) of the procedure.
- * @copyright: The copyright.
- * @date: Copyright date.
- * @proc_type: The procedure type.
- * @num_args: The number of input arguments.
- * @num_values: The number of return values.
- * @args: The input arguments.
- * @return_vals: The return values.
- *
- * Queries the procedural database for information on the specified
- * procedure.
- *
- * This procedure returns information on the specified procedure. A
- * short blurb, detailed help, author(s), copyright information,
- * procedure type, number of input, and number of return values are
- * returned. Additionally this function returns specific information
- * about each input argument and return value.
- *
- * Returns: TRUE on success.
- */
-gboolean
-gimp_pdb_proc_info (const gchar *procedure_name,
- gchar **blurb,
- gchar **help,
- gchar **author,
- gchar **copyright,
- gchar **date,
- GimpPDBProcType *proc_type,
- gint *num_args,
- gint *num_values,
- GimpParamDef **args,
- GimpParamDef **return_vals)
-{
- gint i;
- gboolean success = TRUE;
-
- success = _gimp_pdb_proc_info (procedure_name,
- blurb,
- help,
- author,
- copyright,
- date,
- proc_type,
- num_args,
- num_values);
-
- if (success)
- {
- *args = g_new (GimpParamDef, *num_args);
- *return_vals = g_new (GimpParamDef, *num_values);
-
- for (i = 0; i < *num_args; i++)
- {
- if (! gimp_pdb_proc_arg (procedure_name, i,
- &(*args)[i].type,
- &(*args)[i].name,
- &(*args)[i].description))
- {
- g_free (*args);
- g_free (*return_vals);
-
- return FALSE;
- }
- }
-
- for (i = 0; i < *num_values; i++)
- {
- if (! gimp_pdb_proc_val (procedure_name, i,
- &(*return_vals)[i].type,
- &(*return_vals)[i].name,
- &(*return_vals)[i].description))
- {
- g_free (*args);
- g_free (*return_vals);
-
- return FALSE;
- }
- }
- }
-
- return success;
-}
-
-/**
- * gimp_pdb_proc_arg:
- * @procedure_name: The procedure name.
- * @arg_num: The argument number.
- * @arg_type: (out): The type of argument.
- * @arg_name: (out) (transfer full): The name of the argument.
- * @arg_desc: (out) (transfer full): A description of the argument.
- *
- * Queries the procedural database for information on the specified
- * procedure's argument.
- *
- * This procedure returns information on the specified procedure's
- * argument. The argument type, name, and a description are retrieved.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_pdb_proc_arg (const gchar *procedure_name,
- gint arg_num,
- GimpPDBArgType *arg_type,
- gchar **arg_name,
- gchar **arg_desc)
-{
- return _gimp_pdb_proc_arg (procedure_name, arg_num,
- arg_type, arg_name, arg_desc);
-}
-
-/**
- * gimp_pdb_proc_val:
- * @procedure_name: The procedure name.
- * @val_num: The return value number.
- * @val_type: (out): The type of return value.
- * @val_name: (out) (transfer full): The name of the return value.
- * @val_desc: (out) (transfer full): A description of the return value.
- *
- * Queries the procedural database for information on the specified
- * procedure's return value.
- *
- * This procedure returns information on the specified procedure's
- * return value. The return value type, name, and a description are
- * retrieved.
- *
- * Returns: TRUE on success.
- **/
-gboolean
-gimp_pdb_proc_val (const gchar *procedure_name,
- gint val_num,
- GimpPDBArgType *val_type,
- gchar **val_name,
- gchar **val_desc)
-{
- return _gimp_pdb_proc_val (procedure_name, val_num,
- val_type, val_name, val_desc);
-}
-
/**
* gimp_pdb_get_data:
* @identifier: The identifier associated with data.
diff --git a/libgimp/gimppdb.h b/libgimp/gimppdb.h
index 059cd69d29..1c1159e5a7 100644
--- a/libgimp/gimppdb.h
+++ b/libgimp/gimppdb.h
@@ -90,29 +90,6 @@ gchar * gimp_pdb_temp_procedure_name (GimpPDB *pdb);
/* Cruft API */
-gchar * gimp_pdb_temp_name (void);
-gboolean gimp_pdb_proc_exists (const gchar *procedure_name);
-gboolean gimp_pdb_proc_info (const gchar *procedure_name,
- gchar **blurb,
- gchar **help,
- gchar **author,
- gchar **copyright,
- gchar **date,
- GimpPDBProcType *proc_type,
- gint *num_args,
- gint *num_values,
- GimpParamDef **args,
- GimpParamDef **return_vals);
-gboolean gimp_pdb_proc_arg (const gchar *procedure_name,
- gint arg_num,
- GimpPDBArgType *arg_type,
- gchar **arg_name,
- gchar **arg_desc);
-gboolean gimp_pdb_proc_val (const gchar *procedure_name,
- gint val_num,
- GimpPDBArgType *val_type,
- gchar **val_name,
- gchar **val_desc);
gboolean gimp_pdb_get_data (const gchar *identifier,
gpointer data);
gint gimp_pdb_get_data_size (const gchar *identifier);
@@ -121,7 +98,6 @@ gboolean gimp_pdb_set_data (const gchar *identifier,
guint32 bytes);
-
G_END_DECLS
#endif /* __GIMP_PDB_H__ */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
