Commit f65bd53e authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/pdb/Makefile.am app/pdb/pdb-types.h new object GimpPDB which keeps all

2006-04-26  Michael Natterer  <mitch@gimp.org>

	* app/pdb/Makefile.am
	* app/pdb/pdb-types.h
	* app/pdb/gimppdb.[ch]: new object GimpPDB which keeps all
	procedures and functions to register and run them. Renamed all
	functions and did some cleanups.

	* app/pdb/gimp-pdb.[ch]
	* app/core/gimp.[ch]: removed the same stuff here.

	* app/pdb/gimp-pdb-query.[ch]: removed these files...

	* app/pdb/gimppdb-query.[ch]: ...added here as members of GimpPDB.

	* app/pdb/gimp-pdb-compat.h: fix include guard.

	* app/batch.c
	* app/actions/vectors-commands.c
	* app/dialogs/about-dialog.c
	* app/file/file-open.c
	* app/file/file-save.c
	* app/plug-in/plug-in-message.c
	* app/plug-in/plug-ins.c
	* app/widgets/gimpfiledialog.c
	* app/widgets/gimphelp.c
	* app/xcf/xcf.c
	* tools/pdbgen/pdb/brush_select.pdb
	* tools/pdbgen/pdb/fileops.pdb
	* tools/pdbgen/pdb/font_select.pdb
	* tools/pdbgen/pdb/gradient_select.pdb
	* tools/pdbgen/pdb/palette_select.pdb
	* tools/pdbgen/pdb/pattern_select.pdb
	* tools/pdbgen/pdb/procedural_db.pdb: changed includes and function
	calls accordingly.

	* tools/pdbgen/app.pl: pass around GimpPDB instead of Gimp
	pointers to register the internal procedures with. Changed some
	newlines in the generated code.

	* app/pdb/*_cmds.c
	* app/pdb/internal_procs.[ch]: regenerated.

	* app/core/gimppdbprogress.[ch]
	* app/widgets/gimppdbdialog.[ch]: added "pdb" CONSTRUCT_ONLY
	properties.

	* app/plug-in/plug-in-progress.c
	* app/gui/gui-vtable.c: pass gimp->pdb when creating them.

	* app/widgets/gimpbrushselect.c
	* app/widgets/gimpfontselect.c
	* app/widgets/gimpgradientselect.c
	* app/widgets/gimppaletteselect.c
	* app/widgets/gimppatternselect.c: use the new local pdb pointers
	instead of some foo->bar->gimp->pdb overkill.
parent 35f0511f
2006-04-26 Michael Natterer <mitch@gimp.org>
* app/pdb/Makefile.am
* app/pdb/pdb-types.h
* app/pdb/gimppdb.[ch]: new object GimpPDB which keeps all
procedures and functions to register and run them. Renamed all
functions and did some cleanups.
* app/pdb/gimp-pdb.[ch]
* app/core/gimp.[ch]: removed the same stuff here.
* app/pdb/gimp-pdb-query.[ch]: removed these files...
* app/pdb/gimppdb-query.[ch]: ...added here as members of GimpPDB.
* app/pdb/gimp-pdb-compat.h: fix include guard.
* app/batch.c
* app/actions/vectors-commands.c
* app/dialogs/about-dialog.c
* app/file/file-open.c
* app/file/file-save.c
* app/plug-in/plug-in-message.c
* app/plug-in/plug-ins.c
* app/widgets/gimpfiledialog.c
* app/widgets/gimphelp.c
* app/xcf/xcf.c
* tools/pdbgen/pdb/brush_select.pdb
* tools/pdbgen/pdb/fileops.pdb
* tools/pdbgen/pdb/font_select.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/palette_select.pdb
* tools/pdbgen/pdb/pattern_select.pdb
* tools/pdbgen/pdb/procedural_db.pdb: changed includes and function
calls accordingly.
* tools/pdbgen/app.pl: pass around GimpPDB instead of Gimp
pointers to register the internal procedures with. Changed some
newlines in the generated code.
* app/pdb/*_cmds.c
* app/pdb/internal_procs.[ch]: regenerated.
* app/core/gimppdbprogress.[ch]
* app/widgets/gimppdbdialog.[ch]: added "pdb" CONSTRUCT_ONLY
properties.
* app/plug-in/plug-in-progress.c
* app/gui/gui-vtable.c: pass gimp->pdb when creating them.
* app/widgets/gimpbrushselect.c
* app/widgets/gimpfontselect.c
* app/widgets/gimpgradientselect.c
* app/widgets/gimppaletteselect.c
* app/widgets/gimppatternselect.c: use the new local pdb pointers
instead of some foo->bar->gimp->pdb overkill.
2006-04-25 Michael Natterer <mitch@gimp.org>
* app/tools/gimpthresholdtool.c: added an "Auto" button and
......
......@@ -41,7 +41,7 @@
#include "core/gimpstrokedesc.h"
#include "core/gimptoolinfo.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "pdb/gimpprocedure.h"
#include "vectors/gimpvectors.h"
......@@ -316,9 +316,11 @@ vectors_selection_to_vectors_cmd_callback (GtkAction *action,
return_if_no_image (image, data);
if (value)
procedure = gimp_pdb_lookup (image->gimp, "plug-in-sel2path-advanced");
procedure = gimp_pdb_lookup_procedure (image->gimp->pdb,
"plug-in-sel2path-advanced");
else
procedure = gimp_pdb_lookup (image->gimp, "plug-in-sel2path");
procedure = gimp_pdb_lookup_procedure (image->gimp->pdb,
"plug-in-sel2path");
if (! procedure)
{
......
......@@ -31,7 +31,7 @@
#include "batch.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "pdb/gimpprocedure.h"
#include "gimp-intl.h"
......@@ -77,7 +77,8 @@ batch_run (Gimp *gimp,
strcmp (batch_commands[0], "-") == 0)
{
const gchar *proc_name = "plug-in-script-fu-text-console";
GimpProcedure *procedure = gimp_pdb_lookup (gimp, proc_name);
GimpProcedure *procedure = gimp_pdb_lookup_procedure (gimp->pdb,
proc_name);
if (procedure)
batch_run_cmd (gimp, proc_name, procedure,
......@@ -88,7 +89,8 @@ batch_run (Gimp *gimp,
}
else
{
GimpProcedure *eval_proc = gimp_pdb_lookup (gimp, batch_interpreter);
GimpProcedure *eval_proc = gimp_pdb_lookup_procedure (gimp->pdb,
batch_interpreter);
if (eval_proc)
{
......@@ -140,8 +142,10 @@ batch_run_cmd (Gimp *gimp,
if (procedure->num_args > 1)
g_value_set_static_string (&args->values[1], cmd);
return_vals = gimp_pdb_execute (gimp, gimp_get_user_context (gimp), NULL,
proc_name, args);
return_vals = gimp_pdb_execute_procedure_by_name_args (gimp->pdb,
gimp_get_user_context (gimp),
NULL,
proc_name, args);
switch (g_value_get_enum (&return_vals->values[0]))
{
......
......@@ -235,7 +235,7 @@ gimp_init (Gimp *gimp)
gimp->gradient_factory = NULL;
gimp->palette_factory = NULL;
gimp_pdb_init (gimp);
gimp_pdb_initialize (gimp);
gimp->load_procs = NULL;
gimp->save_procs = NULL;
......@@ -499,8 +499,7 @@ gimp_get_memsize (GimpObject *object,
gimp_object_get_memsize (GIMP_OBJECT (gimp->palette_factory),
gui_size));
memsize += gimp_g_hash_table_get_memsize (gimp->procedural_ht);
memsize += gimp_g_hash_table_get_memsize (gimp->procedural_compat_ht);
memsize += gimp_object_get_memsize (GIMP_OBJECT (gimp->pdb), gui_size);
memsize += gimp_g_slist_get_memsize (gimp->load_procs, 0 /* FIXME */);
memsize += gimp_g_slist_get_memsize (gimp->save_procs, 0 /* FIXME */);
......
......@@ -110,8 +110,7 @@ struct _Gimp
GimpDataFactory *gradient_factory;
GimpDataFactory *palette_factory;
GHashTable *procedural_ht;
GHashTable *procedural_compat_ht;
GimpPDB *pdb;
GSList *load_procs;
GSList *save_procs;
......
......@@ -29,7 +29,7 @@
#include "core/gimpcontext.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "gimpparamspecs.h"
#include "gimppdbprogress.h"
......@@ -41,6 +41,7 @@
enum
{
PROP_0,
PROP_PDB,
PROP_CONTEXT,
PROP_CALLBACK_NAME
};
......@@ -128,6 +129,12 @@ gimp_pdb_progress_class_init (GimpPdbProgressClass *klass)
object_class->finalize = gimp_pdb_progress_finalize;
object_class->set_property = gimp_pdb_progress_set_property;
g_object_class_install_property (object_class, PROP_PDB,
g_param_spec_object ("pdb", NULL, NULL,
GIMP_TYPE_PDB,
GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class, PROP_CONTEXT,
g_param_spec_object ("context", NULL, NULL,
GIMP_TYPE_CONTEXT,
......@@ -174,6 +181,7 @@ gimp_pdb_progress_constructor (GType type,
progress = GIMP_PDB_PROGRESS (object);
g_assert (GIMP_IS_PDB (progress->pdb));
g_assert (GIMP_IS_CONTEXT (progress->context));
return object;
......@@ -194,6 +202,12 @@ gimp_pdb_progress_finalize (GObject *object)
{
GimpPdbProgress *progress = GIMP_PDB_PROGRESS (object);
if (progress->pdb)
{
g_object_unref (progress->pdb);
progress->pdb = NULL;
}
if (progress->context)
{
g_object_unref (progress->context);
......@@ -219,16 +233,24 @@ gimp_pdb_progress_set_property (GObject *object,
switch (property_id)
{
case PROP_PDB:
if (progress->pdb)
g_object_unref (progress->pdb);
progress->pdb = GIMP_PDB (g_value_dup_object (value));
break;
case PROP_CONTEXT:
if (progress->context)
g_object_unref (progress->context);
progress->context = (GimpContext *) g_value_dup_object (value);
progress->context = GIMP_CONTEXT (g_value_dup_object (value));
break;
case PROP_CALLBACK_NAME:
if (progress->callback_name)
g_free (progress->callback_name);
progress->callback_name = g_value_dup_string (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
......@@ -249,14 +271,15 @@ gimp_pdb_progress_run_callback (GimpPdbProgress *progress,
progress->callback_busy = TRUE;
return_vals = gimp_pdb_run_proc (progress->context->gimp,
progress->context,
NULL,
progress->callback_name,
GIMP_TYPE_INT32, command,
G_TYPE_STRING, text,
G_TYPE_DOUBLE, value,
G_TYPE_NONE);
return_vals =
gimp_pdb_execute_procedure_by_name (progress->pdb,
progress->context,
NULL,
progress->callback_name,
GIMP_TYPE_INT32, command,
G_TYPE_STRING, text,
G_TYPE_DOUBLE, value,
G_TYPE_NONE);
if (g_value_get_enum (&return_vals->values[0]) != GIMP_PDB_SUCCESS)
{
......
......@@ -42,6 +42,7 @@ struct _GimpPdbProgress
gboolean active;
gdouble value;
GimpPDB *pdb;
GimpContext *context;
gchar *callback_name;
gboolean callback_busy;
......
......@@ -27,9 +27,10 @@
#include "dialogs-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "about.h"
......@@ -103,7 +104,7 @@ about_dialog_create (GimpContext *context)
GList *children;
GdkModifierType mask;
if (gimp_pdb_lookup (context->gimp, PDB_URL_LOAD))
if (gimp_pdb_lookup_procedure (context->gimp->pdb, PDB_URL_LOAD))
gtk_about_dialog_set_url_hook (about_dialog_load_url,
g_object_ref (context),
(GDestroyNotify) g_object_unref);
......@@ -217,10 +218,11 @@ about_dialog_load_url (GtkAboutDialog *dialog,
GimpContext *context = GIMP_CONTEXT (data);
GValueArray *return_vals;
return_vals = gimp_pdb_run_proc (context->gimp, context, NULL,
PDB_URL_LOAD,
G_TYPE_STRING, url,
G_TYPE_NONE);
return_vals = gimp_pdb_execute_procedure_by_name (context->gimp->pdb,
context, NULL,
PDB_URL_LOAD,
G_TYPE_STRING, url,
G_TYPE_NONE);
g_value_array_free (return_vals);
}
......
......@@ -56,7 +56,7 @@
#include "core/gimpparamspecs.h"
#include "core/gimpprogress.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "pdb/gimppluginprocedure.h"
#include "file-open.h"
......@@ -134,12 +134,14 @@ file_open_image (Gimp *gimp,
filename = g_strdup (uri);
}
return_vals = gimp_pdb_run_proc (gimp, context, progress,
GIMP_OBJECT (file_proc)->name,
GIMP_TYPE_INT32, run_mode,
G_TYPE_STRING, filename,
G_TYPE_STRING, entered_filename,
G_TYPE_NONE);
return_vals =
gimp_pdb_execute_procedure_by_name (gimp->pdb,
context, progress,
GIMP_OBJECT (file_proc)->name,
GIMP_TYPE_INT32, run_mode,
G_TYPE_STRING, filename,
G_TYPE_STRING, entered_filename,
G_TYPE_NONE);
g_free (filename);
......@@ -204,7 +206,7 @@ file_open_thumbnail (Gimp *gimp,
if (! file_proc || ! file_proc->thumb_loader)
return NULL;
procedure = gimp_pdb_lookup (gimp, file_proc->thumb_loader);
procedure = gimp_pdb_lookup_procedure (gimp->pdb, file_proc->thumb_loader);
if (procedure && procedure->num_args >= 2 && procedure->num_values >= 1)
{
......@@ -218,11 +220,13 @@ file_open_thumbnail (Gimp *gimp,
if (! filename)
filename = g_strdup (uri);
return_vals = gimp_pdb_run_proc (gimp, context, progress,
GIMP_OBJECT (procedure)->name,
G_TYPE_STRING, filename,
GIMP_TYPE_INT32, size,
G_TYPE_NONE);
return_vals =
gimp_pdb_execute_procedure_by_name (gimp->pdb,
context, progress,
GIMP_OBJECT (procedure)->name,
G_TYPE_STRING, filename,
GIMP_TYPE_INT32, size,
G_TYPE_NONE);
g_free (filename);
......
......@@ -54,7 +54,7 @@
#include "core/gimpparamspecs.h"
#include "core/gimpprogress.h"
#include "pdb/gimp-pdb.h"
#include "pdb/gimppdb.h"
#include "pdb/gimppluginprocedure.h"
#include "file-save.h"
......@@ -76,9 +76,12 @@ file_save (GimpImage *image,
gboolean save_a_copy,
GError **error)
{
GimpDrawable *drawable;
GValueArray *return_vals;
GimpPDBStatusType status;
gchar *filename;
gint32 image_ID;
gint32 drawable_ID;
g_return_val_if_fail (GIMP_IS_IMAGE (image), GIMP_PDB_CALLING_ERROR);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), GIMP_PDB_CALLING_ERROR);
......@@ -90,7 +93,9 @@ file_save (GimpImage *image,
g_return_val_if_fail (error == NULL || *error == NULL,
GIMP_PDB_CALLING_ERROR);
if (! gimp_image_active_drawable (image))
drawable = gimp_image_active_drawable (image);
if (! drawable)
return GIMP_PDB_EXECUTION_ERROR;
filename = file_utils_filename_from_uri (uri);
......@@ -125,14 +130,19 @@ file_save (GimpImage *image,
/* ref the image, so it can't get deleted during save */
g_object_ref (image);
return_vals = gimp_pdb_run_proc (image->gimp, context, progress,
GIMP_OBJECT (file_proc)->name,
GIMP_TYPE_INT32, run_mode,
GIMP_TYPE_IMAGE_ID, gimp_image_get_ID (image),
GIMP_TYPE_DRAWABLE_ID, gimp_item_get_ID (GIMP_ITEM (gimp_image_active_drawable (image))),
G_TYPE_STRING, filename,
G_TYPE_STRING, uri,
G_TYPE_NONE);
image_ID = gimp_image_get_ID (image);
drawable_ID = gimp_item_get_ID (GIMP_ITEM (drawable));
return_vals =
gimp_pdb_execute_procedure_by_name (image->gimp->pdb,
context, progress,
GIMP_OBJECT (file_proc)->name,
GIMP_TYPE_INT32, run_mode,
GIMP_TYPE_IMAGE_ID, image_ID,
GIMP_TYPE_DRAWABLE_ID, drawable_ID,
G_TYPE_STRING, filename,
G_TYPE_STRING, uri,
G_TYPE_NONE);
status = g_value_get_enum (&return_vals->values[0]);
......
......@@ -636,6 +636,7 @@ gui_pdb_dialog_new (Gimp *gimp,
"role", dialog_role,
"help-func", gimp_standard_help_func,
"help-id", help_id,
"pdb", gimp->pdb,
"context", context,
"select-type", container->children_type,
"initial-object", object,
......
......@@ -9,8 +9,10 @@ libapppdb_a_SOURCES = \
gimp-pdb.h \
gimp-pdb-compat.c \
gimp-pdb-compat.h \
gimp-pdb-query.c \
gimp-pdb-query.h \
gimppdb.c \
gimppdb.h \
gimppdb-query.c \
gimppdb-query.h \
gimpprocedure.c \
gimpprocedure.h \
gimppluginprocedure.c \
......
......@@ -25,7 +25,7 @@
#include <glib-object.h>
#include "pdb-types.h"
#include "gimp-pdb.h"
#include "gimppdb.h"
#include "gimpprocedure.h"
#include "core/gimpparamspecs.h"
......@@ -862,7 +862,7 @@ brush_set_angle_invoker (GimpProcedure *procedure,
}
void
register_brush_procs (Gimp *gimp)
register_brush_procs (GimpPDB *pdb)
{
GimpProcedure *procedure;
......@@ -879,7 +879,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -894,7 +893,7 @@ register_brush_procs (Gimp *gimp)
FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -910,7 +909,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -925,7 +923,7 @@ register_brush_procs (Gimp *gimp)
FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -941,7 +939,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -955,7 +952,7 @@ register_brush_procs (Gimp *gimp)
"TRUE if the brush is generated",
FALSE,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -971,7 +968,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -993,7 +989,7 @@ register_brush_procs (Gimp *gimp)
FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1009,7 +1005,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1017,7 +1012,7 @@ register_brush_procs (Gimp *gimp)
FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1033,7 +1028,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1047,7 +1041,7 @@ register_brush_procs (Gimp *gimp)
"TRUE if the brush can be edited",
FALSE,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1063,7 +1057,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1095,7 +1088,7 @@ register_brush_procs (Gimp *gimp)
"The brush color bpp",
G_MININT32, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1111,7 +1104,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1165,7 +1157,7 @@ register_brush_procs (Gimp *gimp)
"color bytes",
"The brush color data",
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1181,7 +1173,6 @@ register_brush_procs (Gimp *gimp)
"Michael Natterer",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1195,7 +1186,7 @@ register_brush_procs (Gimp *gimp)
"The brush spacing (0 <= spacing <= 1000)",
0, 1000, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1211,7 +1202,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1225,7 +1215,7 @@ register_brush_procs (Gimp *gimp)
"The brush spacing (0 <= spacing <= 1000)",
0, 1000, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1241,7 +1231,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1256,7 +1245,7 @@ register_brush_procs (Gimp *gimp)
GIMP_TYPE_BRUSH_GENERATED_SHAPE,
GIMP_BRUSH_GENERATED_CIRCLE,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1272,7 +1261,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1286,7 +1274,7 @@ register_brush_procs (Gimp *gimp)
"The radius of the brush in pixels",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1302,7 +1290,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1316,7 +1303,7 @@ register_brush_procs (Gimp *gimp)
"The number of spikes on the brush.",
G_MININT32, G_MAXINT32, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1332,7 +1319,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1346,7 +1332,7 @@ register_brush_procs (Gimp *gimp)
"The hardness of the brush.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1362,7 +1348,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1376,7 +1361,7 @@ register_brush_procs (Gimp *gimp)
"The aspect ratio of the brush.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
/*
......@@ -1392,7 +1377,6 @@ register_brush_procs (Gimp *gimp)
"Bill Skaggs",
"2004",
NULL);
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("name",
"name",
......@@ -1406,7 +1390,7 @@ register_brush_procs (Gimp *gimp)
"The rotation angle of the brush.",
-G_MAXDOUBLE, G_MAXDOUBLE, 0,
GIMP_PARAM_READWRITE));
gimp_pdb_register (gimp, procedure);