[gimp] Remove the entire old plug-in interface
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] Remove the entire old plug-in interface
- Date: Tue, 3 Sep 2019 22:06:16 +0000 (UTC)
commit a351ce9126ba2755bfdea00fd647d1635fbb1d14
Author: Michael Natterer <mitch gimp org>
Date: Tue Sep 3 23:55:49 2019 +0200
Remove the entire old plug-in interface
app/pdb/gimppdb-query.c | 3 -
libgimp/Makefile.am | 6 -
libgimp/gimp-private.h | 6 +-
libgimp/gimp.c | 69 +-
libgimp/gimp.def | 4 -
libgimp/gimp.h | 1 -
libgimp/gimp_pdb.c | 77 +--
libgimp/gimpbrush_pdb.c | 242 ++-----
libgimp/gimpbrushes_pdb.c | 22 +-
libgimp/gimpbrushselect_pdb.c | 33 +-
libgimp/gimpbuffer_pdb.c | 77 +--
libgimp/gimpchannel_pdb.c | 110 +---
libgimp/gimpcontext_pdb.c | 1243 ++++++++++-------------------------
libgimp/gimpdebug_pdb.c | 22 +-
libgimp/gimpdisplay.c | 14 +-
libgimp/gimpdisplay_pdb.c | 66 +-
libgimp/gimpdrawable_pdb.c | 264 ++------
libgimp/gimpdrawablecolor_pdb.c | 154 ++---
libgimp/gimpdrawableedit_pdb.c | 66 +-
libgimp/gimpdynamics_pdb.c | 22 +-
libgimp/gimpedit_pdb.c | 110 +---
libgimp/gimpenums.c.tail | 2 -
libgimp/gimpfileops_pdb.c | 143 ++--
libgimp/gimpfloatingsel_pdb.c | 44 +-
libgimp/gimpfonts_pdb.c | 22 +-
libgimp/gimpfontselect_pdb.c | 33 +-
libgimp/gimpgimprc_pdb.c | 77 +--
libgimp/gimpgpcompat.c | 743 ---------------------
libgimp/gimpgpcompat.h | 41 --
libgimp/gimpgradient_pdb.c | 341 +++-------
libgimp/gimpgradients_pdb.c | 22 +-
libgimp/gimpgradientselect_pdb.c | 33 +-
libgimp/gimphelp_pdb.c | 11 +-
libgimp/gimpimage.c | 14 +-
libgimp/gimpimage_pdb.c | 902 +++++++------------------
libgimp/gimpimagecolorprofile_pdb.c | 66 +-
libgimp/gimpimageconvert_pdb.c | 55 +-
libgimp/gimpimagegrid_pdb.c | 110 +---
libgimp/gimpimageguides_pdb.c | 66 +-
libgimp/gimpimagesamplepoints_pdb.c | 44 +-
libgimp/gimpimageselect_pdb.c | 77 +--
libgimp/gimpimagetransform_pdb.c | 66 +-
libgimp/gimpimageundo_pdb.c | 77 +--
libgimp/gimpitem.c | 43 +-
libgimp/gimpitem_pdb.c | 363 +++-------
libgimp/gimpitemtransform_pdb.c | 110 +---
libgimp/gimplayer_pdb.c | 385 +++--------
libgimp/gimplegacy-private.h | 42 --
libgimp/gimplegacy.c | 628 ------------------
libgimp/gimplegacy.h | 274 --------
libgimp/gimpmessage_pdb.c | 33 +-
libgimp/gimppainttools_pdb.c | 187 ++----
libgimp/gimppalette_pdb.c | 165 ++---
libgimp/gimppalettes_pdb.c | 22 +-
libgimp/gimppaletteselect_pdb.c | 33 +-
libgimp/gimppattern_pdb.c | 22 +-
libgimp/gimppatterns_pdb.c | 22 +-
libgimp/gimppatternselect_pdb.c | 33 +-
libgimp/gimppdb_pdb.c | 110 +---
libgimp/gimpplugin_pdb.c | 77 +--
libgimp/gimpprocedure-private.h | 2 -
libgimp/gimpprogress_pdb.c | 99 +--
libgimp/gimpselection_pdb.c | 165 ++---
libgimp/gimptextlayer_pdb.c | 319 +++------
libgimp/gimptexttool_pdb.c | 22 +-
libgimp/gimptilebackendplugin.c | 74 +--
libgimp/gimptypes.h | 5 -
libgimp/gimpunit_pdb.c | 132 +---
libgimp/gimpvectors_pdb.c | 275 +++-----
libgimpbase/gimpbase.def | 1 -
libgimpbase/gimpbaseenums.c | 72 --
libgimpbase/gimpbaseenums.h | 60 --
pdb/enums.pl | 36 -
pdb/lib.pl | 11 +-
po-libgimp/POTFILES.in | 1 -
75 files changed, 2029 insertions(+), 7394 deletions(-)
---
diff --git a/app/pdb/gimppdb-query.c b/app/pdb/gimppdb-query.c
index 016e76bb04..55276f622e 100644
--- a/app/pdb/gimppdb-query.c
+++ b/app/pdb/gimppdb-query.c
@@ -425,7 +425,6 @@ gimp_pdb_print_entry (gpointer key,
GOutputStream *output = pdb_dump->output;
const gchar *proc_name;
GList *list;
- GEnumClass *arg_class;
GEnumClass *proc_class;
GString *buf;
GString *string;
@@ -441,7 +440,6 @@ gimp_pdb_print_entry (gpointer key,
else
list = value;
- arg_class = g_type_class_ref (GIMP_TYPE_PDB_ARG_TYPE);
proc_class = g_type_class_ref (GIMP_TYPE_PDB_PROC_TYPE);
buf = g_string_new (NULL);
@@ -586,7 +584,6 @@ gimp_pdb_print_entry (gpointer key,
g_string_free (string, TRUE);
g_string_free (buf, TRUE);
- g_type_class_unref (arg_class);
g_type_class_unref (proc_class);
}
diff --git a/libgimp/Makefile.am b/libgimp/Makefile.am
index e5df01c892..972cde2df8 100644
--- a/libgimp/Makefile.am
+++ b/libgimp/Makefile.am
@@ -110,13 +110,8 @@ libgimp_private_sources = \
gimp-private.h \
gimp-shm.c \
gimp-shm.h \
- gimpgpcompat.c \
- gimpgpcompat.h \
gimpgpparams.c \
gimpgpparams.h \
- gimplegacy.c \
- gimplegacy.h \
- gimplegacy-private.h \
gimppdb-private.h \
gimppdbprocedure.c \
gimppdbprocedure.h \
@@ -154,7 +149,6 @@ libgimpui_@GIMP_API_VERSION@_la_SOURCES = \
gimpinclude_HEADERS = \
$(libgimp_introspectable_headers) \
- gimplegacy.h \
gimpprocedure-params.h \
$(libgimpui_introspectable_headers)
diff --git a/libgimp/gimp-private.h b/libgimp/gimp-private.h
index 107f5a2471..b5e4e9594d 100644
--- a/libgimp/gimp-private.h
+++ b/libgimp/gimp-private.h
@@ -24,11 +24,7 @@
G_BEGIN_DECLS
-gint _gimp_main_internal (GType plug_in_type,
- const GimpPlugInInfo *info,
- gint argc,
- gchar *argv[]);
-void _gimp_config (GPConfig *config);
+void _gimp_config (GPConfig *config);
G_END_DECLS
diff --git a/libgimp/gimp.c b/libgimp/gimp.c
index 3414069a92..1b11d7df42 100644
--- a/libgimp/gimp.c
+++ b/libgimp/gimp.c
@@ -99,9 +99,7 @@
#include "gimp-debug.h"
#include "gimp-private.h"
#include "gimp-shm.h"
-#include "gimpgpcompat.h"
#include "gimpgpparams.h"
-#include "gimplegacy-private.h"
#include "gimppdb-private.h"
#include "gimpplugin-private.h"
#include "gimpunitcache.h"
@@ -176,15 +174,6 @@ gint
gimp_main (GType plug_in_type,
gint argc,
gchar *argv[])
-{
- return _gimp_main_internal (plug_in_type, NULL, argc, argv);
-}
-
-gint
-_gimp_main_internal (GType plug_in_type,
- const GimpPlugInInfo *info,
- gint argc,
- gchar *argv[])
{
enum
{
@@ -220,8 +209,9 @@ _gimp_main_internal (GType plug_in_type,
}
/* On Windows, set DLL search path to $INSTALLDIR/bin so that GEGL
- file operations can find their respective file library DLLs (such
- as jasper, etc.) without needing to set external PATH. */
+ * file operations can find their respective file library DLLs (such
+ * as jasper, etc.) without needing to set external PATH.
+ */
{
const gchar *install_dir;
gchar *bin_dir;
@@ -260,8 +250,9 @@ _gimp_main_internal (GType plug_in_type,
gchar *dir;
/* This has to be the non-roaming directory (i.e., the local
- directory) as backtraces correspond to the binaries on this
- system. */
+ * directory) as backtraces correspond to the binaries on this
+ * system.
+ */
dir = g_build_filename (g_get_user_data_dir (),
GIMPDIR, GIMP_USER_VERSION, "CrashLog",
NULL);
@@ -313,7 +304,6 @@ _gimp_main_internal (GType plug_in_type,
* by buggy NT C runtime, or something. I don't know why this happens
* on NT (including w2k), but not on w95/98.
*/
-
for (i = 1; i < argc; i++)
{
k = strlen (argv[i]);
@@ -351,8 +341,7 @@ _gimp_main_internal (GType plug_in_type,
#endif /* G_OS_WIN32 */
- g_assert ((plug_in_type != G_TYPE_NONE && info == NULL) ||
- (plug_in_type == G_TYPE_NONE && info != NULL));
+ g_assert (plug_in_type != G_TYPE_NONE);
if ((argc != N_ARGS) || (strcmp (argv[ARG_GIMP], "-gimp") != 0))
{
@@ -559,31 +548,19 @@ _gimp_main_internal (GType plug_in_type,
NULL);
}
- if (plug_in_type != G_TYPE_NONE)
- {
- PLUG_IN = g_object_new (plug_in_type,
- "read-channel", read_channel,
- "write-channel", write_channel,
- NULL);
+ PLUG_IN = g_object_new (plug_in_type,
+ "read-channel", read_channel,
+ "write-channel", write_channel,
+ NULL);
- g_assert (GIMP_IS_PLUG_IN (PLUG_IN));
- }
- else
- {
- _gimp_legacy_initialize (info,
- read_channel,
- write_channel);
- }
+ g_assert (GIMP_IS_PLUG_IN (PLUG_IN));
if (strcmp (argv[ARG_MODE], "-query") == 0)
{
if (_gimp_debug_flags () & GIMP_DEBUG_QUERY)
_gimp_debug_stop ();
- if (PLUG_IN)
- _gimp_plug_in_query (PLUG_IN);
- else
- _gimp_legacy_query ();
+ _gimp_plug_in_query (PLUG_IN);
gimp_close ();
@@ -595,10 +572,7 @@ _gimp_main_internal (GType plug_in_type,
if (_gimp_debug_flags () & GIMP_DEBUG_INIT)
_gimp_debug_stop ();
- if (PLUG_IN)
- _gimp_plug_in_init (PLUG_IN);
- else
- _gimp_legacy_init ();
+ _gimp_plug_in_init (PLUG_IN);
gimp_close ();
@@ -610,10 +584,7 @@ _gimp_main_internal (GType plug_in_type,
else if (_gimp_debug_flags () & GIMP_DEBUG_PID)
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "Here I am!");
- if (PLUG_IN)
- _gimp_plug_in_run (PLUG_IN);
- else
- _gimp_legacy_run ();
+ _gimp_plug_in_run (PLUG_IN);
gimp_close ();
@@ -650,10 +621,7 @@ GimpPDB *
gimp_get_pdb (void)
{
if (! PDB)
- {
- if (PLUG_IN)
- PDB = _gimp_pdb_new (PLUG_IN);
- }
+ PDB = _gimp_pdb_new (PLUG_IN);
return PDB;
}
@@ -948,10 +916,7 @@ gimp_close (void)
if (_gimp_debug_flags () & GIMP_DEBUG_QUIT)
_gimp_debug_stop ();
- if (PLUG_IN)
- _gimp_plug_in_quit (PLUG_IN);
- else
- _gimp_legacy_quit ();
+ _gimp_plug_in_quit (PLUG_IN);
}
static void
diff --git a/libgimp/gimp.def b/libgimp/gimp.def
index 7dbb28a2af..1ef5ce5ce3 100644
--- a/libgimp/gimp.def
+++ b/libgimp/gimp.def
@@ -486,7 +486,6 @@ EXPORTS
gimp_image_undo_thaw
gimp_image_unset_active_channel
gimp_image_width
- gimp_install_procedure
gimp_item_attach_parasite
gimp_item_delete
gimp_item_detach_parasite
@@ -594,7 +593,6 @@ EXPORTS
gimp_load_procedure_set_handles_raw
gimp_load_procedure_set_thumbnail_loader
gimp_main
- gimp_main_legacy
gimp_message
gimp_message_get_handler
gimp_message_set_handler
@@ -678,7 +676,6 @@ EXPORTS
gimp_plug_in_set_help_domain
gimp_plug_in_set_pdb_error_handler
gimp_plug_in_set_translation_domain
- gimp_plugin_menu_register
gimp_procedure_add_argument
gimp_procedure_add_argument_from_property
gimp_procedure_add_menu_path
@@ -727,7 +724,6 @@ EXPORTS
gimp_progress_uninstall
gimp_progress_update
gimp_quit
- gimp_run_procedure_array
gimp_save_procedure_get_type
gimp_save_procedure_new
gimp_selection_all
diff --git a/libgimp/gimp.h b/libgimp/gimp.h
index 43d37e623d..7dd69be50b 100644
--- a/libgimp/gimp.h
+++ b/libgimp/gimp.h
@@ -49,7 +49,6 @@
#include <libgimp/gimplayer.h>
#include <libgimp/gimplayermask.h>
#include <libgimp/gimploadprocedure.h>
-#include <libgimp/gimplegacy.h>
#include <libgimp/gimppaletteselect.h>
#include <libgimp/gimpparamspecs.h>
#include <libgimp/gimppatternselect.h>
diff --git a/libgimp/gimp_pdb.c b/libgimp/gimp_pdb.c
index 9e6d17e0a5..93c5a4bf60 100644
--- a/libgimp/gimp_pdb.c
+++ b/libgimp/gimp_pdb.c
@@ -52,7 +52,6 @@
gchar *
gimp_version (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *version = NULL;
@@ -60,13 +59,9 @@ gimp_version (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-version",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-version",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-version",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -91,7 +86,6 @@ gimp_version (void)
gint
gimp_getpid (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint pid = 0;
@@ -99,13 +93,9 @@ gimp_getpid (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-getpid",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-getpid",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-getpid",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -131,7 +121,6 @@ gimp_getpid (void)
gboolean
gimp_attach_parasite (const GimpParasite *parasite)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -140,13 +129,9 @@ gimp_attach_parasite (const GimpParasite *parasite)
GIMP_TYPE_PARASITE, parasite,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-attach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-attach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-attach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -172,7 +157,6 @@ gimp_attach_parasite (const GimpParasite *parasite)
gboolean
gimp_detach_parasite (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -181,13 +165,9 @@ gimp_detach_parasite (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-detach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-detach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-detach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -212,7 +192,6 @@ gimp_detach_parasite (const gchar *name)
GimpParasite *
gimp_get_parasite (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpParasite *parasite = NULL;
@@ -221,13 +200,9 @@ gimp_get_parasite (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-parasite",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -255,7 +230,6 @@ gimp_get_parasite (const gchar *name)
gchar **
gimp_get_parasite_list (gint *num_parasites)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **parasites = NULL;
@@ -263,13 +237,9 @@ gimp_get_parasite_list (gint *num_parasites)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-parasite-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-parasite-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-parasite-list",
+ args);
gimp_value_array_unref (args);
*num_parasites = 0;
@@ -300,7 +270,6 @@ gimp_get_parasite_list (gint *num_parasites)
gchar *
gimp_temp_name (const gchar *extension)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -309,13 +278,9 @@ gimp_temp_name (const gchar *extension)
G_TYPE_STRING, extension,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-temp-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-temp-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-temp-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpbrush_pdb.c b/libgimp/gimpbrush_pdb.c
index 5b5fb81980..d333e79ad5 100644
--- a/libgimp/gimpbrush_pdb.c
+++ b/libgimp/gimpbrush_pdb.c
@@ -50,7 +50,6 @@
gchar *
gimp_brush_new (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -59,13 +58,9 @@ gimp_brush_new (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -92,7 +87,6 @@ gimp_brush_new (const gchar *name)
gchar *
gimp_brush_duplicate (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *copy_name = NULL;
@@ -101,13 +95,9 @@ gimp_brush_duplicate (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-duplicate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-duplicate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-duplicate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -133,7 +123,6 @@ gimp_brush_duplicate (const gchar *name)
gboolean
gimp_brush_is_generated (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean generated = FALSE;
@@ -142,13 +131,9 @@ gimp_brush_is_generated (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-is-generated",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-is-generated",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-is-generated",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -177,7 +162,6 @@ gchar *
gimp_brush_rename (const gchar *name,
const gchar *new_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -187,13 +171,9 @@ gimp_brush_rename (const gchar *name,
G_TYPE_STRING, new_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-rename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-rename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-rename",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -219,7 +199,6 @@ gimp_brush_rename (const gchar *name,
gboolean
gimp_brush_delete (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -228,13 +207,9 @@ gimp_brush_delete (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -259,7 +234,6 @@ gimp_brush_delete (const gchar *name)
gboolean
gimp_brush_is_editable (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean editable = FALSE;
@@ -268,13 +242,9 @@ gimp_brush_is_editable (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-is-editable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-is-editable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-is-editable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -309,7 +279,6 @@ gimp_brush_get_info (const gchar *name,
gint *mask_bpp,
gint *color_bpp)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -318,13 +287,9 @@ gimp_brush_get_info (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-info",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-info",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-info",
+ args);
gimp_value_array_unref (args);
*width = 0;
@@ -379,7 +344,6 @@ gimp_brush_get_pixels (const gchar *name,
gint *num_color_bytes,
guint8 **color_bytes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -388,13 +352,9 @@ gimp_brush_get_pixels (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-pixels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-pixels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-pixels",
+ args);
gimp_value_array_unref (args);
*width = 0;
@@ -444,7 +404,6 @@ gboolean
gimp_brush_get_spacing (const gchar *name,
gint *spacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -453,13 +412,9 @@ gimp_brush_get_spacing (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-spacing",
+ args);
gimp_value_array_unref (args);
*spacing = 0;
@@ -492,7 +447,6 @@ gboolean
gimp_brush_set_spacing (const gchar *name,
gint spacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -502,13 +456,9 @@ gimp_brush_set_spacing (const gchar *name,
G_TYPE_INT, spacing,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -538,7 +488,6 @@ gimp_brush_set_spacing (const gchar *name,
GimpBrushGeneratedShape
gimp_brush_get_shape (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpBrushGeneratedShape shape = 0;
@@ -547,13 +496,9 @@ gimp_brush_get_shape (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-shape",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-shape",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-shape",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -586,7 +531,6 @@ GimpBrushGeneratedShape
gimp_brush_set_shape (const gchar *name,
GimpBrushGeneratedShape shape_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpBrushGeneratedShape shape_out = 0;
@@ -596,13 +540,9 @@ gimp_brush_set_shape (const gchar *name,
GIMP_TYPE_BRUSH_GENERATED_SHAPE, shape_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-shape",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-shape",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-shape",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -629,7 +569,6 @@ gimp_brush_set_shape (const gchar *name,
gdouble
gimp_brush_get_radius (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble radius = 0.0;
@@ -638,13 +577,9 @@ gimp_brush_get_radius (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-radius",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-radius",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-radius",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -673,7 +608,6 @@ gdouble
gimp_brush_set_radius (const gchar *name,
gdouble radius_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble radius_out = 0.0;
@@ -683,13 +617,9 @@ gimp_brush_set_radius (const gchar *name,
G_TYPE_DOUBLE, radius_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-radius",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-radius",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-radius",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -716,7 +646,6 @@ gimp_brush_set_radius (const gchar *name,
gint
gimp_brush_get_spikes (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint spikes = 0;
@@ -725,13 +654,9 @@ gimp_brush_get_spikes (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-spikes",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-spikes",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-spikes",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -760,7 +685,6 @@ gint
gimp_brush_set_spikes (const gchar *name,
gint spikes_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint spikes_out = 0;
@@ -770,13 +694,9 @@ gimp_brush_set_spikes (const gchar *name,
G_TYPE_INT, spikes_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-spikes",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-spikes",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-spikes",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -805,7 +725,6 @@ gimp_brush_set_spikes (const gchar *name,
gdouble
gimp_brush_get_hardness (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble hardness = 0.0;
@@ -814,13 +733,9 @@ gimp_brush_get_hardness (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-hardness",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-hardness",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-hardness",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -850,7 +765,6 @@ gdouble
gimp_brush_set_hardness (const gchar *name,
gdouble hardness_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble hardness_out = 0.0;
@@ -860,13 +774,9 @@ gimp_brush_set_hardness (const gchar *name,
G_TYPE_DOUBLE, hardness_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-hardness",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-hardness",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-hardness",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -894,7 +804,6 @@ gimp_brush_set_hardness (const gchar *name,
gdouble
gimp_brush_get_aspect_ratio (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble aspect_ratio = 0.0;
@@ -903,13 +812,9 @@ gimp_brush_get_aspect_ratio (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-aspect-ratio",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -939,7 +844,6 @@ gdouble
gimp_brush_set_aspect_ratio (const gchar *name,
gdouble aspect_ratio_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble aspect_ratio_out = 0.0;
@@ -949,13 +853,9 @@ gimp_brush_set_aspect_ratio (const gchar *name,
G_TYPE_DOUBLE, aspect_ratio_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-aspect-ratio",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -982,7 +882,6 @@ gimp_brush_set_aspect_ratio (const gchar *name,
gdouble
gimp_brush_get_angle (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble angle = 0.0;
@@ -991,13 +890,9 @@ gimp_brush_get_angle (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-get-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-get-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-get-angle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1026,7 +921,6 @@ gdouble
gimp_brush_set_angle (const gchar *name,
gdouble angle_in)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble angle_out = 0.0;
@@ -1036,13 +930,9 @@ gimp_brush_set_angle (const gchar *name,
G_TYPE_DOUBLE, angle_in,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brush-set-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brush-set-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brush-set-angle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpbrushes_pdb.c b/libgimp/gimpbrushes_pdb.c
index 256773641b..5b9e7cb2a8 100644
--- a/libgimp/gimpbrushes_pdb.c
+++ b/libgimp/gimpbrushes_pdb.c
@@ -47,7 +47,6 @@
gboolean
gimp_brushes_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -55,13 +54,9 @@ gimp_brushes_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brushes-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brushes-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brushes-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gchar **
gimp_brushes_get_list (const gchar *filter,
gint *num_brushes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **brush_list = NULL;
@@ -99,13 +93,9 @@ gimp_brushes_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brushes-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brushes-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brushes-get-list",
+ args);
gimp_value_array_unref (args);
*num_brushes = 0;
diff --git a/libgimp/gimpbrushselect_pdb.c b/libgimp/gimpbrushselect_pdb.c
index ef2bfb3fd5..76be35dafa 100644
--- a/libgimp/gimpbrushselect_pdb.c
+++ b/libgimp/gimpbrushselect_pdb.c
@@ -57,7 +57,6 @@ gimp_brushes_popup (const gchar *brush_callback,
gint spacing,
GimpLayerMode paint_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -71,13 +70,9 @@ gimp_brushes_popup (const gchar *brush_callback,
GIMP_TYPE_LAYER_MODE, paint_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brushes-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brushes-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brushes-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -100,7 +95,6 @@ gimp_brushes_popup (const gchar *brush_callback,
gboolean
gimp_brushes_close_popup (const gchar *brush_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -109,13 +103,9 @@ gimp_brushes_close_popup (const gchar *brush_callback)
G_TYPE_STRING, brush_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brushes-close-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brushes-close-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brushes-close-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -146,7 +136,6 @@ gimp_brushes_set_popup (const gchar *brush_callback,
gint spacing,
GimpLayerMode paint_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -159,13 +148,9 @@ gimp_brushes_set_popup (const gchar *brush_callback,
GIMP_TYPE_LAYER_MODE, paint_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-brushes-set-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-brushes-set-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-brushes-set-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpbuffer_pdb.c b/libgimp/gimpbuffer_pdb.c
index 1ae1a12a2a..0fd447b929 100644
--- a/libgimp/gimpbuffer_pdb.c
+++ b/libgimp/gimpbuffer_pdb.c
@@ -54,7 +54,6 @@ gchar **
gimp_buffers_get_list (const gchar *filter,
gint *num_buffers)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **buffer_list = NULL;
@@ -63,13 +62,9 @@ gimp_buffers_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffers-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffers-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffers-get-list",
+ args);
gimp_value_array_unref (args);
*num_buffers = 0;
@@ -103,7 +98,6 @@ gchar *
gimp_buffer_rename (const gchar *buffer_name,
const gchar *new_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *real_name = NULL;
@@ -113,13 +107,9 @@ gimp_buffer_rename (const gchar *buffer_name,
G_TYPE_STRING, new_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-rename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-rename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-rename",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -145,7 +135,6 @@ gimp_buffer_rename (const gchar *buffer_name,
gboolean
gimp_buffer_delete (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -154,13 +143,9 @@ gimp_buffer_delete (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -185,7 +170,6 @@ gimp_buffer_delete (const gchar *buffer_name)
gint
gimp_buffer_get_width (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint width = 0;
@@ -194,13 +178,9 @@ gimp_buffer_get_width (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-get-width",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-get-width",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-get-width",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -226,7 +206,6 @@ gimp_buffer_get_width (const gchar *buffer_name)
gint
gimp_buffer_get_height (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint height = 0;
@@ -235,13 +214,9 @@ gimp_buffer_get_height (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-get-height",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-get-height",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-get-height",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -267,7 +242,6 @@ gimp_buffer_get_height (const gchar *buffer_name)
gint
gimp_buffer_get_bytes (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint bytes = 0;
@@ -276,13 +250,9 @@ gimp_buffer_get_bytes (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-get-bytes",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-get-bytes",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-get-bytes",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -308,7 +278,6 @@ gimp_buffer_get_bytes (const gchar *buffer_name)
GimpImageBaseType
gimp_buffer_get_image_type (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImageBaseType image_type = 0;
@@ -317,13 +286,9 @@ gimp_buffer_get_image_type (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-buffer-get-image-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-buffer-get-image-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-buffer-get-image-type",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpchannel_pdb.c b/libgimp/gimpchannel_pdb.c
index 07cf0dc6e1..beb03ba827 100644
--- a/libgimp/gimpchannel_pdb.c
+++ b/libgimp/gimpchannel_pdb.c
@@ -63,7 +63,6 @@ _gimp_channel_new (GimpImage *image,
gdouble opacity,
const GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel = NULL;
@@ -77,13 +76,9 @@ _gimp_channel_new (GimpImage *image,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -117,7 +112,6 @@ gimp_channel_new_from_component (GimpImage *image,
GimpChannelType component,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel = NULL;
@@ -128,13 +122,9 @@ gimp_channel_new_from_component (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-new-from-component",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-new-from-component",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-new-from-component",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -160,7 +150,6 @@ gimp_channel_new_from_component (GimpImage *image,
GimpChannel *
gimp_channel_copy (GimpChannel *channel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel_copy = NULL;
@@ -169,13 +158,9 @@ gimp_channel_copy (GimpChannel *channel)
GIMP_TYPE_CHANNEL, channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-copy",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-copy",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-copy",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -208,7 +193,6 @@ gimp_channel_combine_masks (GimpChannel *channel1,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -221,13 +205,9 @@ gimp_channel_combine_masks (GimpChannel *channel1,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-combine-masks",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-combine-masks",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-combine-masks",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -252,7 +232,6 @@ gimp_channel_combine_masks (GimpChannel *channel1,
gboolean
gimp_channel_get_show_masked (GimpChannel *channel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean show_masked = FALSE;
@@ -261,13 +240,9 @@ gimp_channel_get_show_masked (GimpChannel *channel)
GIMP_TYPE_CHANNEL, channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-get-show-masked",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-get-show-masked",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-get-show-masked",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -295,7 +270,6 @@ gboolean
gimp_channel_set_show_masked (GimpChannel *channel,
gboolean show_masked)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -305,13 +279,9 @@ gimp_channel_set_show_masked (GimpChannel *channel,
G_TYPE_BOOLEAN, show_masked,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-set-show-masked",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-set-show-masked",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-set-show-masked",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -334,7 +304,6 @@ gimp_channel_set_show_masked (GimpChannel *channel,
gdouble
gimp_channel_get_opacity (GimpChannel *channel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble opacity = 0.0;
@@ -343,13 +312,9 @@ gimp_channel_get_opacity (GimpChannel *channel)
GIMP_TYPE_CHANNEL, channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-get-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-get-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-get-opacity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -375,7 +340,6 @@ gboolean
gimp_channel_set_opacity (GimpChannel *channel,
gdouble opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -385,13 +349,9 @@ gimp_channel_set_opacity (GimpChannel *channel,
G_TYPE_DOUBLE, opacity,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-set-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-set-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-set-opacity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -416,7 +376,6 @@ gboolean
gimp_channel_get_color (GimpChannel *channel,
GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -425,13 +384,9 @@ gimp_channel_get_color (GimpChannel *channel,
GIMP_TYPE_CHANNEL, channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-get-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-get-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-get-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -459,7 +414,6 @@ gboolean
gimp_channel_set_color (GimpChannel *channel,
const GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -469,13 +423,9 @@ gimp_channel_set_color (GimpChannel *channel,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-channel-set-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-channel-set-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-channel-set-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpcontext_pdb.c b/libgimp/gimpcontext_pdb.c
index a1cd232c26..9b0d468607 100644
--- a/libgimp/gimpcontext_pdb.c
+++ b/libgimp/gimpcontext_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_context_push (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -58,13 +57,9 @@ gimp_context_push (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-push",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-push",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-push",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -91,7 +86,6 @@ gimp_context_push (void)
gboolean
gimp_context_pop (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -99,13 +93,9 @@ gimp_context_pop (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-pop",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-pop",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-pop",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -133,7 +123,6 @@ gimp_context_pop (void)
gboolean
gimp_context_set_defaults (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -141,13 +130,9 @@ gimp_context_set_defaults (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-defaults",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-defaults",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-defaults",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -175,7 +160,6 @@ gboolean
gimp_context_list_paint_methods (gint *num_paint_methods,
gchar ***paint_methods)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -183,13 +167,9 @@ gimp_context_list_paint_methods (gint *num_paint_methods,
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-list-paint-methods",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-list-paint-methods",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-list-paint-methods",
+ args);
gimp_value_array_unref (args);
*num_paint_methods = 0;
@@ -224,7 +204,6 @@ gimp_context_list_paint_methods (gint *num_paint_methods,
gchar *
gimp_context_get_paint_method (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -232,13 +211,9 @@ gimp_context_get_paint_method (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-paint-method",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-paint-method",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-paint-method",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -269,7 +244,6 @@ gimp_context_get_paint_method (void)
gboolean
gimp_context_set_paint_method (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -278,13 +252,9 @@ gimp_context_set_paint_method (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-paint-method",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-paint-method",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-paint-method",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -308,7 +278,6 @@ gimp_context_set_paint_method (const gchar *name)
GimpStrokeMethod
gimp_context_get_stroke_method (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpStrokeMethod stroke_method = 0;
@@ -316,13 +285,9 @@ gimp_context_get_stroke_method (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-stroke-method",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-stroke-method",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-stroke-method",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -350,7 +315,6 @@ gimp_context_get_stroke_method (void)
gboolean
gimp_context_set_stroke_method (GimpStrokeMethod stroke_method)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -359,13 +323,9 @@ gimp_context_set_stroke_method (GimpStrokeMethod stroke_method)
GIMP_TYPE_STROKE_METHOD, stroke_method,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-stroke-method",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-stroke-method",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-stroke-method",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -392,7 +352,6 @@ gimp_context_set_stroke_method (GimpStrokeMethod stroke_method)
gboolean
gimp_context_get_foreground (GimpRGB *foreground)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -400,13 +359,9 @@ gimp_context_get_foreground (GimpRGB *foreground)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-foreground",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-foreground",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-foreground",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -436,7 +391,6 @@ gimp_context_get_foreground (GimpRGB *foreground)
gboolean
gimp_context_set_foreground (const GimpRGB *foreground)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -445,13 +399,9 @@ gimp_context_set_foreground (const GimpRGB *foreground)
GIMP_TYPE_RGB, foreground,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-foreground",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-foreground",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-foreground",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -478,7 +428,6 @@ gimp_context_set_foreground (const GimpRGB *foreground)
gboolean
gimp_context_get_background (GimpRGB *background)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -486,13 +435,9 @@ gimp_context_get_background (GimpRGB *background)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-background",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-background",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-background",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -523,7 +468,6 @@ gimp_context_get_background (GimpRGB *background)
gboolean
gimp_context_set_background (const GimpRGB *background)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -532,13 +476,9 @@ gimp_context_set_background (const GimpRGB *background)
GIMP_TYPE_RGB, background,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-background",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-background",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-background",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -564,7 +504,6 @@ gimp_context_set_background (const GimpRGB *background)
gboolean
gimp_context_set_default_colors (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -572,13 +511,9 @@ gimp_context_set_default_colors (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-default-colors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-default-colors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-default-colors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -604,7 +539,6 @@ gimp_context_set_default_colors (void)
gboolean
gimp_context_swap_colors (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -612,13 +546,9 @@ gimp_context_swap_colors (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-swap-colors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-swap-colors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-swap-colors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -643,7 +573,6 @@ gimp_context_swap_colors (void)
gdouble
gimp_context_get_opacity (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble opacity = 0.0;
@@ -651,13 +580,9 @@ gimp_context_get_opacity (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-opacity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -684,7 +609,6 @@ gimp_context_get_opacity (void)
gboolean
gimp_context_set_opacity (gdouble opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -693,13 +617,9 @@ gimp_context_set_opacity (gdouble opacity)
G_TYPE_DOUBLE, opacity,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-opacity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -725,7 +645,6 @@ gimp_context_set_opacity (gdouble opacity)
GimpLayerMode
gimp_context_get_paint_mode (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerMode paint_mode = 0;
@@ -733,13 +652,9 @@ gimp_context_get_paint_mode (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-paint-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-paint-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-paint-mode",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -765,7 +680,6 @@ gimp_context_get_paint_mode (void)
gboolean
gimp_context_set_paint_mode (GimpLayerMode paint_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -774,13 +688,9 @@ gimp_context_set_paint_mode (GimpLayerMode paint_mode)
GIMP_TYPE_LAYER_MODE, paint_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-paint-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-paint-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-paint-mode",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -804,7 +714,6 @@ gimp_context_set_paint_mode (GimpLayerMode paint_mode)
gdouble
gimp_context_get_line_width (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble line_width = 0.0;
@@ -812,13 +721,9 @@ gimp_context_get_line_width (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-width",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-width",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-width",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -848,7 +753,6 @@ gimp_context_get_line_width (void)
gboolean
gimp_context_set_line_width (gdouble line_width)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -857,13 +761,9 @@ gimp_context_set_line_width (gdouble line_width)
G_TYPE_DOUBLE, line_width,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-width",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-width",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-width",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -887,7 +787,6 @@ gimp_context_set_line_width (gdouble line_width)
GimpUnit
gimp_context_get_line_width_unit (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpUnit line_width_unit = GIMP_UNIT_PIXEL;
@@ -895,13 +794,9 @@ gimp_context_get_line_width_unit (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-width-unit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-width-unit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-width-unit",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -932,7 +827,6 @@ gimp_context_get_line_width_unit (void)
gboolean
gimp_context_set_line_width_unit (GimpUnit line_width_unit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -941,13 +835,9 @@ gimp_context_set_line_width_unit (GimpUnit line_width_unit)
GIMP_TYPE_UNIT, line_width_unit,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-width-unit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-width-unit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-width-unit",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -971,7 +861,6 @@ gimp_context_set_line_width_unit (GimpUnit line_width_unit)
GimpCapStyle
gimp_context_get_line_cap_style (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpCapStyle cap_style = 0;
@@ -979,13 +868,9 @@ gimp_context_get_line_cap_style (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-cap-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-cap-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-cap-style",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1016,7 +901,6 @@ gimp_context_get_line_cap_style (void)
gboolean
gimp_context_set_line_cap_style (GimpCapStyle cap_style)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1025,13 +909,9 @@ gimp_context_set_line_cap_style (GimpCapStyle cap_style)
GIMP_TYPE_CAP_STYLE, cap_style,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-cap-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-cap-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-cap-style",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1055,7 +935,6 @@ gimp_context_set_line_cap_style (GimpCapStyle cap_style)
GimpJoinStyle
gimp_context_get_line_join_style (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpJoinStyle join_style = 0;
@@ -1063,13 +942,9 @@ gimp_context_get_line_join_style (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-join-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-join-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-join-style",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1100,7 +975,6 @@ gimp_context_get_line_join_style (void)
gboolean
gimp_context_set_line_join_style (GimpJoinStyle join_style)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1109,13 +983,9 @@ gimp_context_set_line_join_style (GimpJoinStyle join_style)
GIMP_TYPE_JOIN_STYLE, join_style,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-join-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-join-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-join-style",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1139,7 +1009,6 @@ gimp_context_set_line_join_style (GimpJoinStyle join_style)
gdouble
gimp_context_get_line_miter_limit (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble miter_limit = 0.0;
@@ -1147,13 +1016,9 @@ gimp_context_get_line_miter_limit (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-miter-limit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-miter-limit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-miter-limit",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1187,7 +1052,6 @@ gimp_context_get_line_miter_limit (void)
gboolean
gimp_context_set_line_miter_limit (gdouble miter_limit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1196,13 +1060,9 @@ gimp_context_set_line_miter_limit (gdouble miter_limit)
G_TYPE_DOUBLE, miter_limit,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-miter-limit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-miter-limit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-miter-limit",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1226,7 +1086,6 @@ gimp_context_set_line_miter_limit (gdouble miter_limit)
gdouble
gimp_context_get_line_dash_offset (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble dash_offset = 0.0;
@@ -1234,13 +1093,9 @@ gimp_context_get_line_dash_offset (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-dash-offset",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-dash-offset",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-dash-offset",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1271,7 +1126,6 @@ gimp_context_get_line_dash_offset (void)
gboolean
gimp_context_set_line_dash_offset (gdouble dash_offset)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1280,13 +1134,9 @@ gimp_context_set_line_dash_offset (gdouble dash_offset)
G_TYPE_DOUBLE, dash_offset,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-dash-offset",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-dash-offset",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-dash-offset",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1313,7 +1163,6 @@ gboolean
gimp_context_get_line_dash_pattern (gint *num_dashes,
gdouble **dashes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1321,13 +1170,9 @@ gimp_context_get_line_dash_pattern (gint *num_dashes,
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-line-dash-pattern",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-line-dash-pattern",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-line-dash-pattern",
+ args);
gimp_value_array_unref (args);
*num_dashes = 0;
@@ -1372,7 +1217,6 @@ gboolean
gimp_context_set_line_dash_pattern (gint num_dashes,
const gdouble *dashes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1383,13 +1227,9 @@ gimp_context_set_line_dash_pattern (gint num_dashes,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 1), dashes, num_dashes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-line-dash-pattern",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-line-dash-pattern",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-line-dash-pattern",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1416,7 +1256,6 @@ gimp_context_set_line_dash_pattern (gint num_dashes,
gchar *
gimp_context_get_brush (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -1424,13 +1263,9 @@ gimp_context_get_brush (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1460,7 +1295,6 @@ gimp_context_get_brush (void)
gboolean
gimp_context_set_brush (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1469,13 +1303,9 @@ gimp_context_set_brush (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1499,7 +1329,6 @@ gimp_context_set_brush (const gchar *name)
gdouble
gimp_context_get_brush_size (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble size = 0.0;
@@ -1507,13 +1336,9 @@ gimp_context_get_brush_size (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-size",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1539,7 +1364,6 @@ gimp_context_get_brush_size (void)
gboolean
gimp_context_set_brush_size (gdouble size)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1548,13 +1372,9 @@ gimp_context_set_brush_size (gdouble size)
G_TYPE_DOUBLE, size,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-size",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1579,7 +1399,6 @@ gimp_context_set_brush_size (gdouble size)
gboolean
gimp_context_set_brush_default_size (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1587,13 +1406,9 @@ gimp_context_set_brush_default_size (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-default-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-default-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-default-size",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1617,7 +1432,6 @@ gimp_context_set_brush_default_size (void)
gdouble
gimp_context_get_brush_aspect_ratio (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble aspect = 0.0;
@@ -1625,13 +1439,9 @@ gimp_context_get_brush_aspect_ratio (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-aspect-ratio",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1657,7 +1467,6 @@ gimp_context_get_brush_aspect_ratio (void)
gboolean
gimp_context_set_brush_aspect_ratio (gdouble aspect)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1666,13 +1475,9 @@ gimp_context_set_brush_aspect_ratio (gdouble aspect)
G_TYPE_DOUBLE, aspect,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-aspect-ratio",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1696,7 +1501,6 @@ gimp_context_set_brush_aspect_ratio (gdouble aspect)
gdouble
gimp_context_get_brush_angle (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble angle = 0.0;
@@ -1704,13 +1508,9 @@ gimp_context_get_brush_angle (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-angle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1736,7 +1536,6 @@ gimp_context_get_brush_angle (void)
gboolean
gimp_context_set_brush_angle (gdouble angle)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1745,13 +1544,9 @@ gimp_context_set_brush_angle (gdouble angle)
G_TYPE_DOUBLE, angle,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-angle",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1776,7 +1571,6 @@ gimp_context_set_brush_angle (gdouble angle)
gdouble
gimp_context_get_brush_spacing (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble spacing = 0.0;
@@ -1784,13 +1578,9 @@ gimp_context_get_brush_spacing (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-spacing",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1817,7 +1607,6 @@ gimp_context_get_brush_spacing (void)
gboolean
gimp_context_set_brush_spacing (gdouble spacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1826,13 +1615,9 @@ gimp_context_set_brush_spacing (gdouble spacing)
G_TYPE_DOUBLE, spacing,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1857,7 +1642,6 @@ gimp_context_set_brush_spacing (gdouble spacing)
gboolean
gimp_context_set_brush_default_spacing (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1865,13 +1649,9 @@ gimp_context_set_brush_default_spacing (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-default-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-default-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-default-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1895,7 +1675,6 @@ gimp_context_set_brush_default_spacing (void)
gdouble
gimp_context_get_brush_hardness (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble hardness = 0.0;
@@ -1903,13 +1682,9 @@ gimp_context_get_brush_hardness (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-hardness",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-hardness",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-hardness",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1935,7 +1710,6 @@ gimp_context_get_brush_hardness (void)
gboolean
gimp_context_set_brush_hardness (gdouble hardness)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1944,13 +1718,9 @@ gimp_context_set_brush_hardness (gdouble hardness)
G_TYPE_DOUBLE, hardness,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-hardness",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-hardness",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-hardness",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1975,7 +1745,6 @@ gimp_context_set_brush_hardness (gdouble hardness)
gboolean
gimp_context_set_brush_default_hardness (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1983,13 +1752,9 @@ gimp_context_set_brush_default_hardness (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-default-hardness",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-default-hardness",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-default-hardness",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2013,7 +1778,6 @@ gimp_context_set_brush_default_hardness (void)
gdouble
gimp_context_get_brush_force (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble force = 0.0;
@@ -2021,13 +1785,9 @@ gimp_context_get_brush_force (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-brush-force",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-brush-force",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-brush-force",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2053,7 +1813,6 @@ gimp_context_get_brush_force (void)
gboolean
gimp_context_set_brush_force (gdouble force)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2062,13 +1821,9 @@ gimp_context_set_brush_force (gdouble force)
G_TYPE_DOUBLE, force,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-brush-force",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-brush-force",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-brush-force",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2095,7 +1850,6 @@ gimp_context_set_brush_force (gdouble force)
gchar *
gimp_context_get_dynamics (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2103,13 +1857,9 @@ gimp_context_get_dynamics (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-dynamics",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-dynamics",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-dynamics",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2140,7 +1890,6 @@ gimp_context_get_dynamics (void)
gboolean
gimp_context_set_dynamics (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2149,13 +1898,9 @@ gimp_context_set_dynamics (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-dynamics",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-dynamics",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-dynamics",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2181,7 +1926,6 @@ gimp_context_set_dynamics (const gchar *name)
gchar *
gimp_context_get_mypaint_brush (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2189,13 +1933,9 @@ gimp_context_get_mypaint_brush (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-mypaint-brush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-mypaint-brush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-mypaint-brush",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2226,7 +1966,6 @@ gimp_context_get_mypaint_brush (void)
gboolean
gimp_context_set_mypaint_brush (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2235,13 +1974,9 @@ gimp_context_set_mypaint_brush (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-mypaint-brush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-mypaint-brush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-mypaint-brush",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2268,7 +2003,6 @@ gimp_context_set_mypaint_brush (const gchar *name)
gchar *
gimp_context_get_pattern (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2276,13 +2010,9 @@ gimp_context_get_pattern (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-pattern",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-pattern",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-pattern",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2313,7 +2043,6 @@ gimp_context_get_pattern (void)
gboolean
gimp_context_set_pattern (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2322,13 +2051,9 @@ gimp_context_set_pattern (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-pattern",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-pattern",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-pattern",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2353,7 +2078,6 @@ gimp_context_set_pattern (const gchar *name)
gchar *
gimp_context_get_gradient (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2361,13 +2085,9 @@ gimp_context_get_gradient (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-gradient",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-gradient",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-gradient",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2398,7 +2118,6 @@ gimp_context_get_gradient (void)
gboolean
gimp_context_set_gradient (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2407,13 +2126,9 @@ gimp_context_set_gradient (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2439,7 +2154,6 @@ gimp_context_set_gradient (const gchar *name)
gboolean
gimp_context_set_gradient_fg_bg_rgb (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2447,13 +2161,9 @@ gimp_context_set_gradient_fg_bg_rgb (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-fg-bg-rgb",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-fg-bg-rgb",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-fg-bg-rgb",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2479,7 +2189,6 @@ gimp_context_set_gradient_fg_bg_rgb (void)
gboolean
gimp_context_set_gradient_fg_bg_hsv_cw (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2487,13 +2196,9 @@ gimp_context_set_gradient_fg_bg_hsv_cw (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-fg-bg-hsv-cw",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-fg-bg-hsv-cw",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-fg-bg-hsv-cw",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2519,7 +2224,6 @@ gimp_context_set_gradient_fg_bg_hsv_cw (void)
gboolean
gimp_context_set_gradient_fg_bg_hsv_ccw (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2527,13 +2231,9 @@ gimp_context_set_gradient_fg_bg_hsv_ccw (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-fg-bg-hsv-ccw",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-fg-bg-hsv-ccw",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-fg-bg-hsv-ccw",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2559,7 +2259,6 @@ gimp_context_set_gradient_fg_bg_hsv_ccw (void)
gboolean
gimp_context_set_gradient_fg_transparent (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2567,13 +2266,9 @@ gimp_context_set_gradient_fg_transparent (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-fg-transparent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-fg-transparent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-fg-transparent",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2598,7 +2293,6 @@ gimp_context_set_gradient_fg_transparent (void)
GimpGradientBlendColorSpace
gimp_context_get_gradient_blend_color_space (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpGradientBlendColorSpace blend_color_space = 0;
@@ -2606,13 +2300,9 @@ gimp_context_get_gradient_blend_color_space (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-gradient-blend-color-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-gradient-blend-color-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-gradient-blend-color-space",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2639,7 +2329,6 @@ gimp_context_get_gradient_blend_color_space (void)
gboolean
gimp_context_set_gradient_blend_color_space (GimpGradientBlendColorSpace blend_color_space)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2648,13 +2337,9 @@ gimp_context_set_gradient_blend_color_space (GimpGradientBlendColorSpace blend_c
GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE, blend_color_space,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-blend-color-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-blend-color-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-blend-color-space",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2678,7 +2363,6 @@ gimp_context_set_gradient_blend_color_space (GimpGradientBlendColorSpace blend_c
GimpRepeatMode
gimp_context_get_gradient_repeat_mode (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpRepeatMode repeat_mode = 0;
@@ -2686,13 +2370,9 @@ gimp_context_get_gradient_repeat_mode (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-gradient-repeat-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-gradient-repeat-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-gradient-repeat-mode",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2718,7 +2398,6 @@ gimp_context_get_gradient_repeat_mode (void)
gboolean
gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2727,13 +2406,9 @@ gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode)
GIMP_TYPE_REPEAT_MODE, repeat_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-repeat-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-repeat-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-repeat-mode",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2758,7 +2433,6 @@ gimp_context_set_gradient_repeat_mode (GimpRepeatMode repeat_mode)
gboolean
gimp_context_get_gradient_reverse (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean reverse = FALSE;
@@ -2766,13 +2440,9 @@ gimp_context_get_gradient_reverse (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-gradient-reverse",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-gradient-reverse",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-gradient-reverse",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2799,7 +2469,6 @@ gimp_context_get_gradient_reverse (void)
gboolean
gimp_context_set_gradient_reverse (gboolean reverse)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2808,13 +2477,9 @@ gimp_context_set_gradient_reverse (gboolean reverse)
G_TYPE_BOOLEAN, reverse,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-gradient-reverse",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-gradient-reverse",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-gradient-reverse",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2839,7 +2504,6 @@ gimp_context_set_gradient_reverse (gboolean reverse)
gchar *
gimp_context_get_palette (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2847,13 +2511,9 @@ gimp_context_get_palette (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-palette",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-palette",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-palette",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2884,7 +2544,6 @@ gimp_context_get_palette (void)
gboolean
gimp_context_set_palette (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2893,13 +2552,9 @@ gimp_context_set_palette (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-palette",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-palette",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-palette",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2924,7 +2579,6 @@ gimp_context_set_palette (const gchar *name)
gchar *
gimp_context_get_font (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -2932,13 +2586,9 @@ gimp_context_get_font (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-font",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-font",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-font",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2968,7 +2618,6 @@ gimp_context_get_font (void)
gboolean
gimp_context_set_font (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2977,13 +2626,9 @@ gimp_context_set_font (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-font",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-font",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-font",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3007,7 +2652,6 @@ gimp_context_set_font (const gchar *name)
gboolean
gimp_context_get_antialias (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean antialias = FALSE;
@@ -3015,13 +2659,9 @@ gimp_context_get_antialias (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-antialias",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-antialias",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-antialias",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3058,7 +2698,6 @@ gimp_context_get_antialias (void)
gboolean
gimp_context_set_antialias (gboolean antialias)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3067,13 +2706,9 @@ gimp_context_set_antialias (gboolean antialias)
G_TYPE_BOOLEAN, antialias,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-antialias",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-antialias",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-antialias",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3097,7 +2732,6 @@ gimp_context_set_antialias (gboolean antialias)
gboolean
gimp_context_get_feather (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean feather = FALSE;
@@ -3105,13 +2739,9 @@ gimp_context_get_feather (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-feather",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-feather",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-feather",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3146,7 +2776,6 @@ gimp_context_get_feather (void)
gboolean
gimp_context_set_feather (gboolean feather)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3155,13 +2784,9 @@ gimp_context_set_feather (gboolean feather)
G_TYPE_BOOLEAN, feather,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-feather",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-feather",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-feather",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3188,7 +2813,6 @@ gboolean
gimp_context_get_feather_radius (gdouble *feather_radius_x,
gdouble *feather_radius_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3196,13 +2820,9 @@ gimp_context_get_feather_radius (gdouble *feather_radius_x,
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-feather-radius",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-feather-radius",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-feather-radius",
+ args);
gimp_value_array_unref (args);
*feather_radius_x = 0.0;
@@ -3241,7 +2861,6 @@ gboolean
gimp_context_set_feather_radius (gdouble feather_radius_x,
gdouble feather_radius_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3251,13 +2870,9 @@ gimp_context_set_feather_radius (gdouble feather_radius_x,
G_TYPE_DOUBLE, feather_radius_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-feather-radius",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-feather-radius",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-feather-radius",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3281,7 +2896,6 @@ gimp_context_set_feather_radius (gdouble feather_radius_x,
gboolean
gimp_context_get_sample_merged (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean sample_merged = FALSE;
@@ -3289,13 +2903,9 @@ gimp_context_get_sample_merged (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-sample-merged",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-sample-merged",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-sample-merged",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3331,7 +2941,6 @@ gimp_context_get_sample_merged (void)
gboolean
gimp_context_set_sample_merged (gboolean sample_merged)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3340,13 +2949,9 @@ gimp_context_set_sample_merged (gboolean sample_merged)
G_TYPE_BOOLEAN, sample_merged,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-sample-merged",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-sample-merged",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-sample-merged",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3370,7 +2975,6 @@ gimp_context_set_sample_merged (gboolean sample_merged)
GimpSelectCriterion
gimp_context_get_sample_criterion (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpSelectCriterion sample_criterion = 0;
@@ -3378,13 +2982,9 @@ gimp_context_get_sample_criterion (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-sample-criterion",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-sample-criterion",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-sample-criterion",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3418,7 +3018,6 @@ gimp_context_get_sample_criterion (void)
gboolean
gimp_context_set_sample_criterion (GimpSelectCriterion sample_criterion)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3427,13 +3026,9 @@ gimp_context_set_sample_criterion (GimpSelectCriterion sample_criterion)
GIMP_TYPE_SELECT_CRITERION, sample_criterion,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-sample-criterion",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-sample-criterion",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-sample-criterion",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3457,7 +3052,6 @@ gimp_context_set_sample_criterion (GimpSelectCriterion sample_criterion)
gdouble
gimp_context_get_sample_threshold (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble sample_threshold = 0.0;
@@ -3465,13 +3059,9 @@ gimp_context_get_sample_threshold (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-sample-threshold",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-sample-threshold",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-sample-threshold",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3506,7 +3096,6 @@ gimp_context_get_sample_threshold (void)
gboolean
gimp_context_set_sample_threshold (gdouble sample_threshold)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3515,13 +3104,9 @@ gimp_context_set_sample_threshold (gdouble sample_threshold)
G_TYPE_DOUBLE, sample_threshold,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-sample-threshold",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-sample-threshold",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-sample-threshold",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3546,7 +3131,6 @@ gimp_context_set_sample_threshold (gdouble sample_threshold)
gint
gimp_context_get_sample_threshold_int (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint sample_threshold = 0;
@@ -3554,13 +3138,9 @@ gimp_context_get_sample_threshold_int (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-sample-threshold-int",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-sample-threshold-int",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-sample-threshold-int",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3587,7 +3167,6 @@ gimp_context_get_sample_threshold_int (void)
gboolean
gimp_context_set_sample_threshold_int (gint sample_threshold)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3596,13 +3175,9 @@ gimp_context_set_sample_threshold_int (gint sample_threshold)
G_TYPE_INT, sample_threshold,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-sample-threshold-int",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-sample-threshold-int",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-sample-threshold-int",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3626,7 +3201,6 @@ gimp_context_set_sample_threshold_int (gint sample_threshold)
gboolean
gimp_context_get_sample_transparent (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean sample_transparent = FALSE;
@@ -3634,13 +3208,9 @@ gimp_context_get_sample_transparent (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-sample-transparent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-sample-transparent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-sample-transparent",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3674,7 +3244,6 @@ gimp_context_get_sample_transparent (void)
gboolean
gimp_context_set_sample_transparent (gboolean sample_transparent)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3683,13 +3252,9 @@ gimp_context_set_sample_transparent (gboolean sample_transparent)
G_TYPE_BOOLEAN, sample_transparent,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-sample-transparent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-sample-transparent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-sample-transparent",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3713,7 +3278,6 @@ gimp_context_set_sample_transparent (gboolean sample_transparent)
gboolean
gimp_context_get_diagonal_neighbors (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean diagonal_neighbors = FALSE;
@@ -3721,13 +3285,9 @@ gimp_context_get_diagonal_neighbors (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-diagonal-neighbors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-diagonal-neighbors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-diagonal-neighbors",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3762,7 +3322,6 @@ gimp_context_get_diagonal_neighbors (void)
gboolean
gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3771,13 +3330,9 @@ gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors)
G_TYPE_BOOLEAN, diagonal_neighbors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-diagonal-neighbors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-diagonal-neighbors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-diagonal-neighbors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3802,7 +3357,6 @@ gimp_context_set_diagonal_neighbors (gboolean diagonal_neighbors)
GeglDistanceMetric
gimp_context_get_distance_metric (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GeglDistanceMetric metric = 0;
@@ -3810,13 +3364,9 @@ gimp_context_get_distance_metric (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-distance-metric",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-distance-metric",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-distance-metric",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3848,7 +3398,6 @@ gimp_context_get_distance_metric (void)
gboolean
gimp_context_set_distance_metric (GeglDistanceMetric metric)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3857,13 +3406,9 @@ gimp_context_set_distance_metric (GeglDistanceMetric metric)
GEGL_TYPE_DISTANCE_METRIC, metric,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-distance-metric",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-distance-metric",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-distance-metric",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3891,7 +3436,6 @@ gimp_context_set_distance_metric (GeglDistanceMetric metric)
GimpInterpolationType
gimp_context_get_interpolation (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpInterpolationType interpolation = 0;
@@ -3899,13 +3443,9 @@ gimp_context_get_interpolation (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-interpolation",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-interpolation",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-interpolation",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3938,7 +3478,6 @@ gimp_context_get_interpolation (void)
gboolean
gimp_context_set_interpolation (GimpInterpolationType interpolation)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3947,13 +3486,9 @@ gimp_context_set_interpolation (GimpInterpolationType interpolation)
GIMP_TYPE_INTERPOLATION_TYPE, interpolation,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-interpolation",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-interpolation",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-interpolation",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3979,7 +3514,6 @@ gimp_context_set_interpolation (GimpInterpolationType interpolation)
GimpTransformDirection
gimp_context_get_transform_direction (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpTransformDirection transform_direction = 0;
@@ -3987,13 +3521,9 @@ gimp_context_get_transform_direction (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-transform-direction",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-transform-direction",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-transform-direction",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4025,7 +3555,6 @@ gimp_context_get_transform_direction (void)
gboolean
gimp_context_set_transform_direction (GimpTransformDirection transform_direction)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4034,13 +3563,9 @@ gimp_context_set_transform_direction (GimpTransformDirection transform_direction
GIMP_TYPE_TRANSFORM_DIRECTION, transform_direction,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-transform-direction",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-transform-direction",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-transform-direction",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4066,7 +3591,6 @@ gimp_context_set_transform_direction (GimpTransformDirection transform_direction
GimpTransformResize
gimp_context_get_transform_resize (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpTransformResize transform_resize = 0;
@@ -4074,13 +3598,9 @@ gimp_context_get_transform_resize (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-transform-resize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-transform-resize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-transform-resize",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4116,7 +3636,6 @@ gimp_context_get_transform_resize (void)
gboolean
gimp_context_set_transform_resize (GimpTransformResize transform_resize)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4125,13 +3644,9 @@ gimp_context_set_transform_resize (GimpTransformResize transform_resize)
GIMP_TYPE_TRANSFORM_RESIZE, transform_resize,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-transform-resize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-transform-resize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-transform-resize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4155,7 +3670,6 @@ gimp_context_set_transform_resize (GimpTransformResize transform_resize)
gdouble
gimp_context_get_ink_size (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble size = 0.0;
@@ -4163,13 +3677,9 @@ gimp_context_get_ink_size (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-size",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4195,7 +3705,6 @@ gimp_context_get_ink_size (void)
gboolean
gimp_context_set_ink_size (gdouble size)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4204,13 +3713,9 @@ gimp_context_set_ink_size (gdouble size)
G_TYPE_DOUBLE, size,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-size",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4234,7 +3739,6 @@ gimp_context_set_ink_size (gdouble size)
gdouble
gimp_context_get_ink_angle (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble angle = 0.0;
@@ -4242,13 +3746,9 @@ gimp_context_get_ink_angle (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-angle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4274,7 +3774,6 @@ gimp_context_get_ink_angle (void)
gboolean
gimp_context_set_ink_angle (gdouble angle)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4283,13 +3782,9 @@ gimp_context_set_ink_angle (gdouble angle)
G_TYPE_DOUBLE, angle,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-angle",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4313,7 +3808,6 @@ gimp_context_set_ink_angle (gdouble angle)
gdouble
gimp_context_get_ink_size_sensitivity (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble size = 0.0;
@@ -4321,13 +3815,9 @@ gimp_context_get_ink_size_sensitivity (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-size-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-size-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-size-sensitivity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4353,7 +3843,6 @@ gimp_context_get_ink_size_sensitivity (void)
gboolean
gimp_context_set_ink_size_sensitivity (gdouble size)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4362,13 +3851,9 @@ gimp_context_set_ink_size_sensitivity (gdouble size)
G_TYPE_DOUBLE, size,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-size-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-size-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-size-sensitivity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4392,7 +3877,6 @@ gimp_context_set_ink_size_sensitivity (gdouble size)
gdouble
gimp_context_get_ink_tilt_sensitivity (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble tilt = 0.0;
@@ -4400,13 +3884,9 @@ gimp_context_get_ink_tilt_sensitivity (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-tilt-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-tilt-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-tilt-sensitivity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4432,7 +3912,6 @@ gimp_context_get_ink_tilt_sensitivity (void)
gboolean
gimp_context_set_ink_tilt_sensitivity (gdouble tilt)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4441,13 +3920,9 @@ gimp_context_set_ink_tilt_sensitivity (gdouble tilt)
G_TYPE_DOUBLE, tilt,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-tilt-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-tilt-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-tilt-sensitivity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4471,7 +3946,6 @@ gimp_context_set_ink_tilt_sensitivity (gdouble tilt)
gdouble
gimp_context_get_ink_speed_sensitivity (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble speed = 0.0;
@@ -4479,13 +3953,9 @@ gimp_context_get_ink_speed_sensitivity (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-speed-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-speed-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-speed-sensitivity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4511,7 +3981,6 @@ gimp_context_get_ink_speed_sensitivity (void)
gboolean
gimp_context_set_ink_speed_sensitivity (gdouble speed)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4520,13 +3989,9 @@ gimp_context_set_ink_speed_sensitivity (gdouble speed)
G_TYPE_DOUBLE, speed,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-speed-sensitivity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-speed-sensitivity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-speed-sensitivity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4550,7 +4015,6 @@ gimp_context_set_ink_speed_sensitivity (gdouble speed)
GimpInkBlobType
gimp_context_get_ink_blob_type (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpInkBlobType type = 0;
@@ -4558,13 +4022,9 @@ gimp_context_get_ink_blob_type (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-blob-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-blob-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-blob-type",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4590,7 +4050,6 @@ gimp_context_get_ink_blob_type (void)
gboolean
gimp_context_set_ink_blob_type (GimpInkBlobType type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4599,13 +4058,9 @@ gimp_context_set_ink_blob_type (GimpInkBlobType type)
GIMP_TYPE_INK_BLOB_TYPE, type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-blob-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-blob-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-blob-type",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4629,7 +4084,6 @@ gimp_context_set_ink_blob_type (GimpInkBlobType type)
gdouble
gimp_context_get_ink_blob_aspect_ratio (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble aspect = 0.0;
@@ -4637,13 +4091,9 @@ gimp_context_get_ink_blob_aspect_ratio (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-blob-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-blob-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-blob-aspect-ratio",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4669,7 +4119,6 @@ gimp_context_get_ink_blob_aspect_ratio (void)
gboolean
gimp_context_set_ink_blob_aspect_ratio (gdouble aspect)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4678,13 +4127,9 @@ gimp_context_set_ink_blob_aspect_ratio (gdouble aspect)
G_TYPE_DOUBLE, aspect,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-blob-aspect-ratio",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-blob-aspect-ratio",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-blob-aspect-ratio",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -4708,7 +4153,6 @@ gimp_context_set_ink_blob_aspect_ratio (gdouble aspect)
gdouble
gimp_context_get_ink_blob_angle (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble angle = 0.0;
@@ -4716,13 +4160,9 @@ gimp_context_get_ink_blob_angle (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-get-ink-blob-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-get-ink-blob-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-get-ink-blob-angle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -4748,7 +4188,6 @@ gimp_context_get_ink_blob_angle (void)
gboolean
gimp_context_set_ink_blob_angle (gdouble angle)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -4757,13 +4196,9 @@ gimp_context_set_ink_blob_angle (gdouble angle)
G_TYPE_DOUBLE, angle,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-context-set-ink-blob-angle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-context-set-ink-blob-angle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-context-set-ink-blob-angle",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpdebug_pdb.c b/libgimp/gimpdebug_pdb.c
index d546261aec..7909f139a7 100644
--- a/libgimp/gimpdebug_pdb.c
+++ b/libgimp/gimpdebug_pdb.c
@@ -54,7 +54,6 @@
gboolean
gimp_debug_timer_start (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -62,13 +61,9 @@ gimp_debug_timer_start (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-debug-timer-start",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-debug-timer-start",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-debug-timer-start",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -97,7 +92,6 @@ gimp_debug_timer_start (void)
gdouble
gimp_debug_timer_end (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble elapsed = 0.0;
@@ -105,13 +99,9 @@ gimp_debug_timer_end (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-debug-timer-end",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-debug-timer-end",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-debug-timer-end",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpdisplay.c b/libgimp/gimpdisplay.c
index b66067c783..f796231b40 100644
--- a/libgimp/gimpdisplay.c
+++ b/libgimp/gimpdisplay.c
@@ -160,18 +160,10 @@ gimp_display_get_by_id (gint32 display_id)
{
if (display_id > 0)
{
- GimpPlugIn *plug_in = gimp_get_plug_in ();
+ GimpPlugIn *plug_in = gimp_get_plug_in ();
+ GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
- if (plug_in)
- {
- GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
-
- return _gimp_procedure_get_display (procedure, display_id);
- }
-
- return g_object_new (GIMP_TYPE_DISPLAY,
- "id", display_id,
- NULL);
+ return _gimp_procedure_get_display (procedure, display_id);
}
return NULL;
diff --git a/libgimp/gimpdisplay_pdb.c b/libgimp/gimpdisplay_pdb.c
index 11c5654bcb..3ebc6660bd 100644
--- a/libgimp/gimpdisplay_pdb.c
+++ b/libgimp/gimpdisplay_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_display_id_is_valid (gint display_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean valid = FALSE;
@@ -59,13 +58,9 @@ gimp_display_id_is_valid (gint display_id)
G_TYPE_INT, display_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-display-id-is-valid",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-display-id-is-valid",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-display-id-is-valid",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -94,7 +89,6 @@ gimp_display_id_is_valid (gint display_id)
GimpDisplay *
gimp_display_new (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpDisplay *display = NULL;
@@ -103,13 +97,9 @@ gimp_display_new (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-display-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-display-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-display-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -137,7 +127,6 @@ gimp_display_new (GimpImage *image)
gboolean
gimp_display_delete (GimpDisplay *display)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -146,13 +135,9 @@ gimp_display_delete (GimpDisplay *display)
GIMP_TYPE_DISPLAY, display,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-display-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-display-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-display-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -181,7 +166,6 @@ gimp_display_delete (GimpDisplay *display)
gint
gimp_display_get_window_handle (GimpDisplay *display)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint window = 0;
@@ -190,13 +174,9 @@ gimp_display_get_window_handle (GimpDisplay *display)
GIMP_TYPE_DISPLAY, display,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-display-get-window-handle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-display-get-window-handle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-display-get-window-handle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -222,7 +202,6 @@ gimp_display_get_window_handle (GimpDisplay *display)
gboolean
gimp_displays_flush (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -230,13 +209,9 @@ gimp_displays_flush (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-displays-flush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-displays-flush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-displays-flush",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -264,7 +239,6 @@ gboolean
gimp_displays_reconnect (GimpImage *old_image,
GimpImage *new_image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -274,13 +248,9 @@ gimp_displays_reconnect (GimpImage *old_image,
GIMP_TYPE_IMAGE, new_image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-displays-reconnect",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-displays-reconnect",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-displays-reconnect",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpdrawable_pdb.c b/libgimp/gimpdrawable_pdb.c
index 1fb93e5b0a..ca0970867b 100644
--- a/libgimp/gimpdrawable_pdb.c
+++ b/libgimp/gimpdrawable_pdb.c
@@ -53,7 +53,6 @@
gchar *
_gimp_drawable_get_format (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *format = NULL;
@@ -62,13 +61,9 @@ _gimp_drawable_get_format (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-get-format",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-get-format",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-get-format",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -97,7 +92,6 @@ _gimp_drawable_get_format (GimpDrawable *drawable)
gchar *
_gimp_drawable_get_thumbnail_format (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *format = NULL;
@@ -106,13 +100,9 @@ _gimp_drawable_get_thumbnail_format (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-get-thumbnail-format",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-get-thumbnail-format",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-get-thumbnail-format",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -136,7 +126,6 @@ _gimp_drawable_get_thumbnail_format (GimpDrawable *drawable)
GimpImageType
gimp_drawable_type (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImageType type = 0;
@@ -145,13 +134,9 @@ gimp_drawable_type (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-type",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -178,7 +163,6 @@ gimp_drawable_type (GimpDrawable *drawable)
GimpImageType
gimp_drawable_type_with_alpha (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImageType type_with_alpha = 0;
@@ -187,13 +171,9 @@ gimp_drawable_type_with_alpha (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-type-with-alpha",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-type-with-alpha",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-type-with-alpha",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -219,7 +199,6 @@ gimp_drawable_type_with_alpha (GimpDrawable *drawable)
gboolean
gimp_drawable_has_alpha (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean has_alpha = FALSE;
@@ -228,13 +207,9 @@ gimp_drawable_has_alpha (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-has-alpha",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-has-alpha",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-has-alpha",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -259,7 +234,6 @@ gimp_drawable_has_alpha (GimpDrawable *drawable)
gboolean
gimp_drawable_is_rgb (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean is_rgb = FALSE;
@@ -268,13 +242,9 @@ gimp_drawable_is_rgb (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-is-rgb",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-is-rgb",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-is-rgb",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -299,7 +269,6 @@ gimp_drawable_is_rgb (GimpDrawable *drawable)
gboolean
gimp_drawable_is_gray (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean is_gray = FALSE;
@@ -308,13 +277,9 @@ gimp_drawable_is_gray (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-is-gray",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-is-gray",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-is-gray",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -339,7 +304,6 @@ gimp_drawable_is_gray (GimpDrawable *drawable)
gboolean
gimp_drawable_is_indexed (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean is_indexed = FALSE;
@@ -348,13 +312,9 @@ gimp_drawable_is_indexed (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-is-indexed",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-is-indexed",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-is-indexed",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -378,7 +338,6 @@ gimp_drawable_is_indexed (GimpDrawable *drawable)
gint
gimp_drawable_bpp (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint bpp = 0;
@@ -387,13 +346,9 @@ gimp_drawable_bpp (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-bpp",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-bpp",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-bpp",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -417,7 +372,6 @@ gimp_drawable_bpp (GimpDrawable *drawable)
gint
gimp_drawable_width (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint width = 0;
@@ -426,13 +380,9 @@ gimp_drawable_width (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-width",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-width",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-width",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -456,7 +406,6 @@ gimp_drawable_width (GimpDrawable *drawable)
gint
gimp_drawable_height (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint height = 0;
@@ -465,13 +414,9 @@ gimp_drawable_height (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-height",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-height",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-height",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -501,7 +446,6 @@ gimp_drawable_offsets (GimpDrawable *drawable,
gint *offset_x,
gint *offset_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -510,13 +454,9 @@ gimp_drawable_offsets (GimpDrawable *drawable,
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-offsets",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-offsets",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-offsets",
+ args);
gimp_value_array_unref (args);
*offset_x = 0;
@@ -568,7 +508,6 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
gint *x2,
gint *y2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean non_empty = FALSE;
@@ -577,13 +516,9 @@ gimp_drawable_mask_bounds (GimpDrawable *drawable,
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-mask-bounds",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-mask-bounds",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-mask-bounds",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -628,7 +563,6 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable,
gint *width,
gint *height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean non_empty = FALSE;
@@ -637,13 +571,9 @@ gimp_drawable_mask_intersect (GimpDrawable *drawable,
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-mask-intersect",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-mask-intersect",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-mask-intersect",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -678,7 +608,6 @@ gboolean
gimp_drawable_merge_shadow (GimpDrawable *drawable,
gboolean undo)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -688,13 +617,9 @@ gimp_drawable_merge_shadow (GimpDrawable *drawable,
G_TYPE_BOOLEAN, undo,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-merge-shadow",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-merge-shadow",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-merge-shadow",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -722,7 +647,6 @@ gimp_drawable_merge_shadow (GimpDrawable *drawable,
gboolean
gimp_drawable_free_shadow (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -731,13 +655,9 @@ gimp_drawable_free_shadow (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-free-shadow",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-free-shadow",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-free-shadow",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -771,7 +691,6 @@ gimp_drawable_update (GimpDrawable *drawable,
gint width,
gint height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -784,13 +703,9 @@ gimp_drawable_update (GimpDrawable *drawable,
G_TYPE_INT, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-update",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-update",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-update",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -823,7 +738,6 @@ gimp_drawable_get_pixel (GimpDrawable *drawable,
gint y_coord,
gint *num_channels)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint8 *pixel = NULL;
@@ -834,13 +748,9 @@ gimp_drawable_get_pixel (GimpDrawable *drawable,
G_TYPE_INT, y_coord,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-get-pixel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-get-pixel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-get-pixel",
+ args);
gimp_value_array_unref (args);
*num_channels = 0;
@@ -881,7 +791,6 @@ gimp_drawable_set_pixel (GimpDrawable *drawable,
gint num_channels,
const guint8 *pixel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -895,13 +804,9 @@ gimp_drawable_set_pixel (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 4), pixel, num_channels);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-set-pixel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-set-pixel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-set-pixel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -936,7 +841,6 @@ gboolean
gimp_drawable_fill (GimpDrawable *drawable,
GimpFillType fill_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -946,13 +850,9 @@ gimp_drawable_fill (GimpDrawable *drawable,
GIMP_TYPE_FILL_TYPE, fill_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-fill",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-fill",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-fill",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -989,7 +889,6 @@ gimp_drawable_offset (GimpDrawable *drawable,
gint offset_x,
gint offset_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1002,13 +901,9 @@ gimp_drawable_offset (GimpDrawable *drawable,
G_TYPE_INT, offset_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-offset",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-offset",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-offset",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1048,7 +943,6 @@ _gimp_drawable_thumbnail (GimpDrawable *drawable,
gint *thumbnail_data_count,
guint8 **thumbnail_data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1059,13 +953,9 @@ _gimp_drawable_thumbnail (GimpDrawable *drawable,
G_TYPE_INT, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-thumbnail",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-thumbnail",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-thumbnail",
+ args);
gimp_value_array_unref (args);
*actual_width = 0;
@@ -1130,7 +1020,6 @@ _gimp_drawable_sub_thumbnail (GimpDrawable *drawable,
gint *thumbnail_data_count,
guint8 **thumbnail_data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1145,13 +1034,9 @@ _gimp_drawable_sub_thumbnail (GimpDrawable *drawable,
G_TYPE_INT, dest_height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-sub-thumbnail",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-sub-thumbnail",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-sub-thumbnail",
+ args);
gimp_value_array_unref (args);
*width = 0;
@@ -1196,7 +1081,6 @@ gimp_drawable_foreground_extract (GimpDrawable *drawable,
GimpForegroundExtractMode mode,
GimpDrawable *mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1207,13 +1091,9 @@ gimp_drawable_foreground_extract (GimpDrawable *drawable,
GIMP_TYPE_DRAWABLE, mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-foreground-extract",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-foreground-extract",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-foreground-extract",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpdrawablecolor_pdb.c b/libgimp/gimpdrawablecolor_pdb.c
index 21c681d4da..b82ed83ae1 100644
--- a/libgimp/gimpdrawablecolor_pdb.c
+++ b/libgimp/gimpdrawablecolor_pdb.c
@@ -56,7 +56,6 @@ gimp_drawable_brightness_contrast (GimpDrawable *drawable,
gdouble brightness,
gdouble contrast)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -67,13 +66,9 @@ gimp_drawable_brightness_contrast (GimpDrawable *drawable,
G_TYPE_DOUBLE, contrast,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-brightness-contrast",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-brightness-contrast",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-brightness-contrast",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -115,7 +110,6 @@ gimp_drawable_color_balance (GimpDrawable *drawable,
gdouble magenta_green,
gdouble yellow_blue)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -129,13 +123,9 @@ gimp_drawable_color_balance (GimpDrawable *drawable,
G_TYPE_DOUBLE, yellow_blue,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-color-balance",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-color-balance",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-color-balance",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -169,7 +159,6 @@ gimp_drawable_colorize_hsl (GimpDrawable *drawable,
gdouble saturation,
gdouble lightness)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -181,13 +170,9 @@ gimp_drawable_colorize_hsl (GimpDrawable *drawable,
G_TYPE_DOUBLE, lightness,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-colorize-hsl",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-colorize-hsl",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-colorize-hsl",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -223,7 +208,6 @@ gimp_drawable_curves_explicit (GimpDrawable *drawable,
gint num_values,
const gdouble *values)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -236,13 +220,9 @@ gimp_drawable_curves_explicit (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), values, num_values);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-curves-explicit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-curves-explicit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-curves-explicit",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -278,7 +258,6 @@ gimp_drawable_curves_spline (GimpDrawable *drawable,
gint num_points,
const gdouble *points)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -291,13 +270,9 @@ gimp_drawable_curves_spline (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), points, num_points);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-curves-spline",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-curves-spline",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-curves-spline",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -327,7 +302,6 @@ gboolean
gimp_drawable_desaturate (GimpDrawable *drawable,
GimpDesaturateMode desaturate_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -337,13 +311,9 @@ gimp_drawable_desaturate (GimpDrawable *drawable,
GIMP_TYPE_DESATURATE_MODE, desaturate_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-desaturate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-desaturate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-desaturate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -376,7 +346,6 @@ gboolean
gimp_drawable_equalize (GimpDrawable *drawable,
gboolean mask_only)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -386,13 +355,9 @@ gimp_drawable_equalize (GimpDrawable *drawable,
G_TYPE_BOOLEAN, mask_only,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-equalize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-equalize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-equalize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -450,7 +415,6 @@ gimp_drawable_histogram (GimpDrawable *drawable,
gdouble *count,
gdouble *percentile)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -462,13 +426,9 @@ gimp_drawable_histogram (GimpDrawable *drawable,
G_TYPE_DOUBLE, end_range,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-histogram",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-histogram",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-histogram",
+ args);
gimp_value_array_unref (args);
*mean = 0.0;
@@ -524,7 +484,6 @@ gimp_drawable_hue_saturation (GimpDrawable *drawable,
gdouble saturation,
gdouble overlap)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -538,13 +497,9 @@ gimp_drawable_hue_saturation (GimpDrawable *drawable,
G_TYPE_DOUBLE, overlap,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-hue-saturation",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-hue-saturation",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-hue-saturation",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -574,7 +529,6 @@ gboolean
gimp_drawable_invert (GimpDrawable *drawable,
gboolean linear)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -584,13 +538,9 @@ gimp_drawable_invert (GimpDrawable *drawable,
G_TYPE_BOOLEAN, linear,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-invert",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-invert",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-invert",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -642,7 +592,6 @@ gimp_drawable_levels (GimpDrawable *drawable,
gdouble high_output,
gboolean clamp_output)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -659,13 +608,9 @@ gimp_drawable_levels (GimpDrawable *drawable,
G_TYPE_BOOLEAN, clamp_output,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-levels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-levels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-levels",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -692,7 +637,6 @@ gimp_drawable_levels (GimpDrawable *drawable,
gboolean
gimp_drawable_levels_stretch (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -701,13 +645,9 @@ gimp_drawable_levels_stretch (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-levels-stretch",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-levels-stretch",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-levels-stretch",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -735,7 +675,6 @@ gboolean
gimp_drawable_posterize (GimpDrawable *drawable,
gint levels)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -745,13 +684,9 @@ gimp_drawable_posterize (GimpDrawable *drawable,
G_TYPE_INT, levels,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-posterize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-posterize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-posterize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -785,7 +720,6 @@ gimp_drawable_threshold (GimpDrawable *drawable,
gdouble low_threshold,
gdouble high_threshold)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -797,13 +731,9 @@ gimp_drawable_threshold (GimpDrawable *drawable,
G_TYPE_DOUBLE, high_threshold,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-threshold",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-threshold",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-threshold",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpdrawableedit_pdb.c b/libgimp/gimpdrawableedit_pdb.c
index c28934284c..e38ccfe65e 100644
--- a/libgimp/gimpdrawableedit_pdb.c
+++ b/libgimp/gimpdrawableedit_pdb.c
@@ -54,7 +54,6 @@
gboolean
gimp_drawable_edit_clear (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -63,13 +62,9 @@ gimp_drawable_edit_clear (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-clear",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-clear",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-clear",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -102,7 +97,6 @@ gboolean
gimp_drawable_edit_fill (GimpDrawable *drawable,
GimpFillType fill_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -112,13 +106,9 @@ gimp_drawable_edit_fill (GimpDrawable *drawable,
GIMP_TYPE_FILL_TYPE, fill_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-fill",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-fill",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-fill",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -161,7 +151,6 @@ gimp_drawable_edit_bucket_fill (GimpDrawable *drawable,
gdouble x,
gdouble y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -173,13 +162,9 @@ gimp_drawable_edit_bucket_fill (GimpDrawable *drawable,
G_TYPE_DOUBLE, y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-bucket-fill",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-bucket-fill",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-bucket-fill",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -235,7 +220,6 @@ gimp_drawable_edit_gradient_fill (GimpDrawable *drawable,
gdouble x2,
gdouble y2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -254,13 +238,9 @@ gimp_drawable_edit_gradient_fill (GimpDrawable *drawable,
G_TYPE_DOUBLE, y2,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-gradient-fill",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-gradient-fill",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-gradient-fill",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -294,7 +274,6 @@ gimp_drawable_edit_gradient_fill (GimpDrawable *drawable,
gboolean
gimp_drawable_edit_stroke_selection (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -303,13 +282,9 @@ gimp_drawable_edit_stroke_selection (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-stroke-selection",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-stroke-selection",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-stroke-selection",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -347,7 +322,6 @@ gboolean
gimp_drawable_edit_stroke_item (GimpDrawable *drawable,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -357,13 +331,9 @@ gimp_drawable_edit_stroke_item (GimpDrawable *drawable,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-drawable-edit-stroke-item",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-drawable-edit-stroke-item",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-drawable-edit-stroke-item",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpdynamics_pdb.c b/libgimp/gimpdynamics_pdb.c
index 749327e08b..c89114052b 100644
--- a/libgimp/gimpdynamics_pdb.c
+++ b/libgimp/gimpdynamics_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_dynamics_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -58,13 +57,9 @@ gimp_dynamics_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-dynamics-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-dynamics-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-dynamics-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -94,7 +89,6 @@ gchar **
gimp_dynamics_get_list (const gchar *filter,
gint *num_dynamics)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **dynamics_list = NULL;
@@ -103,13 +97,9 @@ gimp_dynamics_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-dynamics-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-dynamics-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-dynamics-get-list",
+ args);
gimp_value_array_unref (args);
*num_dynamics = 0;
diff --git a/libgimp/gimpedit_pdb.c b/libgimp/gimpedit_pdb.c
index 53c6535e36..5bdc036aa9 100644
--- a/libgimp/gimpedit_pdb.c
+++ b/libgimp/gimpedit_pdb.c
@@ -54,7 +54,6 @@
gboolean
gimp_edit_cut (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean non_empty = FALSE;
@@ -63,13 +62,9 @@ gimp_edit_cut (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-cut",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-cut",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-cut",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -100,7 +95,6 @@ gimp_edit_cut (GimpDrawable *drawable)
gboolean
gimp_edit_copy (GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean non_empty = FALSE;
@@ -109,13 +103,9 @@ gimp_edit_copy (GimpDrawable *drawable)
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-copy",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-copy",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-copy",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -146,7 +136,6 @@ gimp_edit_copy (GimpDrawable *drawable)
gboolean
gimp_edit_copy_visible (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean non_empty = FALSE;
@@ -155,13 +144,9 @@ gimp_edit_copy_visible (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-copy-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-copy-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-copy-visible",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -201,7 +186,6 @@ GimpLayer *
gimp_edit_paste (GimpDrawable *drawable,
gboolean paste_into)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *floating_sel = NULL;
@@ -211,13 +195,9 @@ gimp_edit_paste (GimpDrawable *drawable,
G_TYPE_BOOLEAN, paste_into,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-paste",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-paste",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-paste",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -245,7 +225,6 @@ gimp_edit_paste (GimpDrawable *drawable,
GimpImage *
gimp_edit_paste_as_new_image (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -253,13 +232,9 @@ gimp_edit_paste_as_new_image (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-paste-as-new-image",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-paste-as-new-image",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-paste-as-new-image",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -292,7 +267,6 @@ gchar *
gimp_edit_named_cut (GimpDrawable *drawable,
const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *real_name = NULL;
@@ -302,13 +276,9 @@ gimp_edit_named_cut (GimpDrawable *drawable,
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-named-cut",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-named-cut",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-named-cut",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -341,7 +311,6 @@ gchar *
gimp_edit_named_copy (GimpDrawable *drawable,
const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *real_name = NULL;
@@ -351,13 +320,9 @@ gimp_edit_named_copy (GimpDrawable *drawable,
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-named-copy",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-named-copy",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-named-copy",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -390,7 +355,6 @@ gchar *
gimp_edit_named_copy_visible (GimpImage *image,
const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *real_name = NULL;
@@ -400,13 +364,9 @@ gimp_edit_named_copy_visible (GimpImage *image,
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-named-copy-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-named-copy-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-named-copy-visible",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -437,7 +397,6 @@ gimp_edit_named_paste (GimpDrawable *drawable,
const gchar *buffer_name,
gboolean paste_into)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *floating_sel = NULL;
@@ -448,13 +407,9 @@ gimp_edit_named_paste (GimpDrawable *drawable,
G_TYPE_BOOLEAN, paste_into,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-named-paste",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-named-paste",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-named-paste",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -481,7 +436,6 @@ gimp_edit_named_paste (GimpDrawable *drawable,
GimpImage *
gimp_edit_named_paste_as_new_image (const gchar *buffer_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -490,13 +444,9 @@ gimp_edit_named_paste_as_new_image (const gchar *buffer_name)
G_TYPE_STRING, buffer_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-edit-named-paste-as-new-image",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-edit-named-paste-as-new-image",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-edit-named-paste-as-new-image",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpenums.c.tail b/libgimp/gimpenums.c.tail
index bbf7ad11cd..50ca3413d7 100644
--- a/libgimp/gimpenums.c.tail
+++ b/libgimp/gimpenums.c.tail
@@ -44,7 +44,6 @@ static const GimpGetTypeFunc get_type_funcs[] =
gimp_message_handler_type_get_type,
gimp_offset_type_get_type,
gimp_orientation_type_get_type,
- gimp_pdb_arg_type_get_type,
gimp_pdb_error_handler_get_type,
gimp_pdb_proc_type_get_type,
gimp_pdb_status_type_get_type,
@@ -110,7 +109,6 @@ static const gchar * const type_names[] =
"GimpMessageHandlerType",
"GimpOffsetType",
"GimpOrientationType",
- "GimpPDBArgType",
"GimpPDBErrorHandler",
"GimpPDBProcType",
"GimpPDBStatusType",
diff --git a/libgimp/gimpfileops_pdb.c b/libgimp/gimpfileops_pdb.c
index 50c1354f3a..012674e7f7 100644
--- a/libgimp/gimpfileops_pdb.c
+++ b/libgimp/gimpfileops_pdb.c
@@ -57,7 +57,6 @@ gimp_file_load (GimpRunMode run_mode,
const gchar *filename,
const gchar *raw_filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -68,13 +67,9 @@ gimp_file_load (GimpRunMode run_mode,
G_TYPE_STRING, raw_filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-file-load",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-file-load",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-file-load",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -107,7 +102,6 @@ gimp_file_load_layer (GimpRunMode run_mode,
GimpImage *image,
const gchar *filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -118,13 +112,9 @@ gimp_file_load_layer (GimpRunMode run_mode,
G_TYPE_STRING, filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-file-load-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-file-load-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-file-load-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -161,7 +151,6 @@ gimp_file_load_layers (GimpRunMode run_mode,
const gchar *filename,
gint *num_layers)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *layer_ids = NULL;
@@ -172,13 +161,9 @@ gimp_file_load_layers (GimpRunMode run_mode,
G_TYPE_STRING, filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-file-load-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-file-load-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-file-load-layers",
+ args);
gimp_value_array_unref (args);
*num_layers = 0;
@@ -221,7 +206,6 @@ gimp_file_save (GimpRunMode run_mode,
const gchar *filename,
const gchar *raw_filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -234,13 +218,9 @@ gimp_file_save (GimpRunMode run_mode,
G_TYPE_STRING, raw_filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-file-save",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-file-save",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-file-save",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -270,7 +250,6 @@ gboolean
gimp_file_save_thumbnail (GimpImage *image,
const gchar *filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -280,13 +259,9 @@ gimp_file_save_thumbnail (GimpImage *image,
G_TYPE_STRING, filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-file-save-thumbnail",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-file-save-thumbnail",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-file-save-thumbnail",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -316,7 +291,6 @@ _gimp_register_magic_load_handler (const gchar *procedure_name,
const gchar *prefixes,
const gchar *magics)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -328,13 +302,9 @@ _gimp_register_magic_load_handler (const gchar *procedure_name,
G_TYPE_STRING, magics,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-magic-load-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-magic-load-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-magic-load-handler",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -362,7 +332,6 @@ _gimp_register_load_handler (const gchar *procedure_name,
const gchar *extensions,
const gchar *prefixes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -373,13 +342,9 @@ _gimp_register_load_handler (const gchar *procedure_name,
G_TYPE_STRING, prefixes,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-load-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-load-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-load-handler",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -407,7 +372,6 @@ _gimp_register_save_handler (const gchar *procedure_name,
const gchar *extensions,
const gchar *prefixes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -418,13 +382,9 @@ _gimp_register_save_handler (const gchar *procedure_name,
G_TYPE_STRING, prefixes,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-save-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-save-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-save-handler",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -455,7 +415,6 @@ gboolean
_gimp_register_file_handler_priority (const gchar *procedure_name,
gint priority)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -465,13 +424,9 @@ _gimp_register_file_handler_priority (const gchar *procedure_name,
G_TYPE_INT, priority,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-file-handler-priority",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-file-handler-priority",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-file-handler-priority",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -503,7 +458,6 @@ gboolean
_gimp_register_file_handler_mime (const gchar *procedure_name,
const gchar *mime_types)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -513,13 +467,9 @@ _gimp_register_file_handler_mime (const gchar *procedure_name,
G_TYPE_STRING, mime_types,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-file-handler-mime",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-file-handler-mime",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-file-handler-mime",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -547,7 +497,6 @@ _gimp_register_file_handler_mime (const gchar *procedure_name,
gboolean
_gimp_register_file_handler_remote (const gchar *procedure_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -556,13 +505,9 @@ _gimp_register_file_handler_remote (const gchar *procedure_name)
G_TYPE_STRING, procedure_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-file-handler-remote",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-file-handler-remote",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-file-handler-remote",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -590,7 +535,6 @@ _gimp_register_file_handler_remote (const gchar *procedure_name)
gboolean
_gimp_register_file_handler_raw (const gchar *procedure_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -599,13 +543,9 @@ _gimp_register_file_handler_raw (const gchar *procedure_name)
G_TYPE_STRING, procedure_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-file-handler-raw",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-file-handler-raw",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-file-handler-raw",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -637,7 +577,6 @@ gboolean
_gimp_register_thumbnail_loader (const gchar *load_proc,
const gchar *thumb_proc)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -647,13 +586,9 @@ _gimp_register_thumbnail_loader (const gchar *load_proc,
G_TYPE_STRING, thumb_proc,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-register-thumbnail-loader",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-register-thumbnail-loader",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-register-thumbnail-loader",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpfloatingsel_pdb.c b/libgimp/gimpfloatingsel_pdb.c
index 663060623e..13e4237e8c 100644
--- a/libgimp/gimpfloatingsel_pdb.c
+++ b/libgimp/gimpfloatingsel_pdb.c
@@ -49,7 +49,6 @@
gboolean
gimp_floating_sel_remove (GimpLayer *floating_sel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -58,13 +57,9 @@ gimp_floating_sel_remove (GimpLayer *floating_sel)
GIMP_TYPE_LAYER, floating_sel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-floating-sel-remove",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-floating-sel-remove",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-floating-sel-remove",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gimp_floating_sel_remove (GimpLayer *floating_sel)
gboolean
gimp_floating_sel_anchor (GimpLayer *floating_sel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -99,13 +93,9 @@ gimp_floating_sel_anchor (GimpLayer *floating_sel)
GIMP_TYPE_LAYER, floating_sel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-floating-sel-anchor",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-floating-sel-anchor",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-floating-sel-anchor",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -135,7 +125,6 @@ gimp_floating_sel_anchor (GimpLayer *floating_sel)
gboolean
gimp_floating_sel_to_layer (GimpLayer *floating_sel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -144,13 +133,9 @@ gimp_floating_sel_to_layer (GimpLayer *floating_sel)
GIMP_TYPE_LAYER, floating_sel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-floating-sel-to-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-floating-sel-to-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-floating-sel-to-layer",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -176,7 +161,6 @@ gboolean
gimp_floating_sel_attach (GimpLayer *layer,
GimpDrawable *drawable)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -186,13 +170,9 @@ gimp_floating_sel_attach (GimpLayer *layer,
GIMP_TYPE_DRAWABLE, drawable,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-floating-sel-attach",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-floating-sel-attach",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-floating-sel-attach",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpfonts_pdb.c b/libgimp/gimpfonts_pdb.c
index 99205b6558..541d4ff694 100644
--- a/libgimp/gimpfonts_pdb.c
+++ b/libgimp/gimpfonts_pdb.c
@@ -48,7 +48,6 @@
gboolean
gimp_fonts_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -56,13 +55,9 @@ gimp_fonts_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-fonts-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-fonts-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-fonts-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gchar **
gimp_fonts_get_list (const gchar *filter,
gint *num_fonts)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **font_list = NULL;
@@ -99,13 +93,9 @@ gimp_fonts_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-fonts-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-fonts-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-fonts-get-list",
+ args);
gimp_value_array_unref (args);
*num_fonts = 0;
diff --git a/libgimp/gimpfontselect_pdb.c b/libgimp/gimpfontselect_pdb.c
index 237bc8b705..6907c5e7c6 100644
--- a/libgimp/gimpfontselect_pdb.c
+++ b/libgimp/gimpfontselect_pdb.c
@@ -51,7 +51,6 @@ gimp_fonts_popup (const gchar *font_callback,
const gchar *popup_title,
const gchar *initial_font)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -62,13 +61,9 @@ gimp_fonts_popup (const gchar *font_callback,
G_TYPE_STRING, initial_font,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-fonts-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-fonts-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-fonts-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -91,7 +86,6 @@ gimp_fonts_popup (const gchar *font_callback,
gboolean
gimp_fonts_close_popup (const gchar *font_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -100,13 +94,9 @@ gimp_fonts_close_popup (const gchar *font_callback)
G_TYPE_STRING, font_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-fonts-close-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-fonts-close-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-fonts-close-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -131,7 +121,6 @@ gboolean
gimp_fonts_set_popup (const gchar *font_callback,
const gchar *font_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -141,13 +130,9 @@ gimp_fonts_set_popup (const gchar *font_callback,
G_TYPE_STRING, font_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-fonts-set-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-fonts-set-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-fonts-set-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpgimprc_pdb.c b/libgimp/gimpgimprc_pdb.c
index 59b6b1facd..eaca925400 100644
--- a/libgimp/gimpgimprc_pdb.c
+++ b/libgimp/gimpgimprc_pdb.c
@@ -56,7 +56,6 @@
gchar *
gimp_gimprc_query (const gchar *token)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *value = NULL;
@@ -65,13 +64,9 @@ gimp_gimprc_query (const gchar *token)
G_TYPE_STRING, token,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gimprc-query",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gimprc-query",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gimprc-query",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -101,7 +96,6 @@ gboolean
gimp_gimprc_set (const gchar *token,
const gchar *value)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -111,13 +105,9 @@ gimp_gimprc_set (const gchar *token,
G_TYPE_STRING, value,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gimprc-set",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gimprc-set",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gimprc-set",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -140,7 +130,6 @@ gimp_gimprc_set (const gchar *token,
gchar *
gimp_get_default_comment (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *comment = NULL;
@@ -148,13 +137,9 @@ gimp_get_default_comment (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-default-comment",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-default-comment",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-default-comment",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -179,7 +164,6 @@ gimp_get_default_comment (void)
GimpUnit
gimp_get_default_unit (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpUnit unit_id = GIMP_UNIT_PIXEL;
@@ -187,13 +171,9 @@ gimp_get_default_unit (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-default-unit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-default-unit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-default-unit",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -222,7 +202,6 @@ gboolean
gimp_get_monitor_resolution (gdouble *xres,
gdouble *yres)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -230,13 +209,9 @@ gimp_get_monitor_resolution (gdouble *xres,
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-monitor-resolution",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-monitor-resolution",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-monitor-resolution",
+ args);
gimp_value_array_unref (args);
*xres = 0.0;
@@ -271,7 +246,6 @@ gimp_get_monitor_resolution (gdouble *xres,
gchar *
_gimp_get_color_configuration (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *config = NULL;
@@ -279,13 +253,9 @@ _gimp_get_color_configuration (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-color-configuration",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-color-configuration",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-color-configuration",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -309,7 +279,6 @@ _gimp_get_color_configuration (void)
gchar *
gimp_get_module_load_inhibit (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *load_inhibit = NULL;
@@ -317,13 +286,9 @@ gimp_get_module_load_inhibit (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-get-module-load-inhibit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-get-module-load-inhibit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-get-module-load-inhibit",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpgradient_pdb.c b/libgimp/gimpgradient_pdb.c
index eed5178b6b..4facc4ca7f 100644
--- a/libgimp/gimpgradient_pdb.c
+++ b/libgimp/gimpgradient_pdb.c
@@ -50,7 +50,6 @@
gchar *
gimp_gradient_new (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -59,13 +58,9 @@ gimp_gradient_new (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -92,7 +87,6 @@ gimp_gradient_new (const gchar *name)
gchar *
gimp_gradient_duplicate (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *copy_name = NULL;
@@ -101,13 +95,9 @@ gimp_gradient_duplicate (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-duplicate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-duplicate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-duplicate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -133,7 +123,6 @@ gimp_gradient_duplicate (const gchar *name)
gboolean
gimp_gradient_is_editable (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean editable = FALSE;
@@ -142,13 +131,9 @@ gimp_gradient_is_editable (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-is-editable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-is-editable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-is-editable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -177,7 +162,6 @@ gchar *
gimp_gradient_rename (const gchar *name,
const gchar *new_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -187,13 +171,9 @@ gimp_gradient_rename (const gchar *name,
G_TYPE_STRING, new_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-rename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-rename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-rename",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -219,7 +199,6 @@ gimp_gradient_rename (const gchar *name,
gboolean
gimp_gradient_delete (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -228,13 +207,9 @@ gimp_gradient_delete (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -260,7 +235,6 @@ gimp_gradient_delete (const gchar *name)
gint
gimp_gradient_get_number_of_segments (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint num_segments = 0;
@@ -269,13 +243,9 @@ gimp_gradient_get_number_of_segments (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-get-number-of-segments",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-get-number-of-segments",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-get-number-of-segments",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -315,7 +285,6 @@ gimp_gradient_get_uniform_samples (const gchar *name,
gint *num_color_samples,
gdouble **color_samples)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -326,13 +295,9 @@ gimp_gradient_get_uniform_samples (const gchar *name,
G_TYPE_BOOLEAN, reverse,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-get-uniform-samples",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-get-uniform-samples",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-get-uniform-samples",
+ args);
gimp_value_array_unref (args);
*num_color_samples = 0;
@@ -381,7 +346,6 @@ gimp_gradient_get_custom_samples (const gchar *name,
gint *num_color_samples,
gdouble **color_samples)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -394,13 +358,9 @@ gimp_gradient_get_custom_samples (const gchar *name,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), positions, num_samples);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-get-custom-samples",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-get-custom-samples",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-get-custom-samples",
+ args);
gimp_value_array_unref (args);
*num_color_samples = 0;
@@ -441,7 +401,6 @@ gimp_gradient_segment_get_left_color (const gchar *name,
GimpRGB *color,
gdouble *opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -451,13 +410,9 @@ gimp_gradient_segment_get_left_color (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-left-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-left-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-left-color",
+ args);
gimp_value_array_unref (args);
*opacity = 0.0;
@@ -497,7 +452,6 @@ gimp_gradient_segment_set_left_color (const gchar *name,
const GimpRGB *color,
gdouble opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -509,13 +463,9 @@ gimp_gradient_segment_set_left_color (const gchar *name,
G_TYPE_DOUBLE, opacity,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-set-left-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-set-left-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-set-left-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -547,7 +497,6 @@ gimp_gradient_segment_get_right_color (const gchar *name,
GimpRGB *color,
gdouble *opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -557,13 +506,9 @@ gimp_gradient_segment_get_right_color (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-right-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-right-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-right-color",
+ args);
gimp_value_array_unref (args);
*opacity = 0.0;
@@ -603,7 +548,6 @@ gimp_gradient_segment_set_right_color (const gchar *name,
const GimpRGB *color,
gdouble opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -615,13 +559,9 @@ gimp_gradient_segment_set_right_color (const gchar *name,
G_TYPE_DOUBLE, opacity,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-set-right-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-set-right-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-set-right-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -651,7 +591,6 @@ gimp_gradient_segment_get_left_pos (const gchar *name,
gint segment,
gdouble *pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -661,13 +600,9 @@ gimp_gradient_segment_get_left_pos (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-left-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-left-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-left-pos",
+ args);
gimp_value_array_unref (args);
*pos = 0.0;
@@ -707,7 +642,6 @@ gimp_gradient_segment_set_left_pos (const gchar *name,
gdouble pos,
gdouble *final_pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -718,13 +652,9 @@ gimp_gradient_segment_set_left_pos (const gchar *name,
G_TYPE_DOUBLE, pos,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-set-left-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-set-left-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-set-left-pos",
+ args);
gimp_value_array_unref (args);
*final_pos = 0.0;
@@ -759,7 +689,6 @@ gimp_gradient_segment_get_middle_pos (const gchar *name,
gint segment,
gdouble *pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -769,13 +698,9 @@ gimp_gradient_segment_get_middle_pos (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-middle-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-middle-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-middle-pos",
+ args);
gimp_value_array_unref (args);
*pos = 0.0;
@@ -814,7 +739,6 @@ gimp_gradient_segment_set_middle_pos (const gchar *name,
gdouble pos,
gdouble *final_pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -825,13 +749,9 @@ gimp_gradient_segment_set_middle_pos (const gchar *name,
G_TYPE_DOUBLE, pos,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-set-middle-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-set-middle-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-set-middle-pos",
+ args);
gimp_value_array_unref (args);
*final_pos = 0.0;
@@ -866,7 +786,6 @@ gimp_gradient_segment_get_right_pos (const gchar *name,
gint segment,
gdouble *pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -876,13 +795,9 @@ gimp_gradient_segment_get_right_pos (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-right-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-right-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-right-pos",
+ args);
gimp_value_array_unref (args);
*pos = 0.0;
@@ -922,7 +837,6 @@ gimp_gradient_segment_set_right_pos (const gchar *name,
gdouble pos,
gdouble *final_pos)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -933,13 +847,9 @@ gimp_gradient_segment_set_right_pos (const gchar *name,
G_TYPE_DOUBLE, pos,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-set-right-pos",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-set-right-pos",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-set-right-pos",
+ args);
gimp_value_array_unref (args);
*final_pos = 0.0;
@@ -974,7 +884,6 @@ gimp_gradient_segment_get_blending_function (const gchar *name,
gint segment,
GimpGradientSegmentType *blend_func)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -984,13 +893,9 @@ gimp_gradient_segment_get_blending_function (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-blending-function",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-blending-function",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-blending-function",
+ args);
gimp_value_array_unref (args);
*blend_func = 0;
@@ -1025,7 +930,6 @@ gimp_gradient_segment_get_coloring_type (const gchar *name,
gint segment,
GimpGradientSegmentColor *coloring_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1035,13 +939,9 @@ gimp_gradient_segment_get_coloring_type (const gchar *name,
G_TYPE_INT, segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-get-coloring-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-get-coloring-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-get-coloring-type",
+ args);
gimp_value_array_unref (args);
*coloring_type = 0;
@@ -1078,7 +978,6 @@ gimp_gradient_segment_range_set_blending_function (const gchar *name
gint end_segment,
GimpGradientSegmentType blending_function)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1090,13 +989,9 @@ gimp_gradient_segment_range_set_blending_function (const gchar *name
GIMP_TYPE_GRADIENT_SEGMENT_TYPE, blending_function,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-set-blending-function",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-set-blending-function",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-set-blending-function",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1128,7 +1023,6 @@ gimp_gradient_segment_range_set_coloring_type (const gchar *name,
gint end_segment,
GimpGradientSegmentColor coloring_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1140,13 +1034,9 @@ gimp_gradient_segment_range_set_coloring_type (const gchar *name,
GIMP_TYPE_GRADIENT_SEGMENT_COLOR, coloring_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-set-coloring-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-set-coloring-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-set-coloring-type",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1175,7 +1065,6 @@ gimp_gradient_segment_range_flip (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1186,13 +1075,9 @@ gimp_gradient_segment_range_flip (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-flip",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-flip",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-flip",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1225,7 +1110,6 @@ gimp_gradient_segment_range_replicate (const gchar *name,
gint end_segment,
gint replicate_times)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1237,13 +1121,9 @@ gimp_gradient_segment_range_replicate (const gchar *name,
G_TYPE_INT, replicate_times,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-replicate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-replicate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-replicate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1273,7 +1153,6 @@ gimp_gradient_segment_range_split_midpoint (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1284,13 +1163,9 @@ gimp_gradient_segment_range_split_midpoint (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-split-midpoint",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-split-midpoint",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-split-midpoint",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1322,7 +1197,6 @@ gimp_gradient_segment_range_split_uniform (const gchar *name,
gint end_segment,
gint split_parts)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1334,13 +1208,9 @@ gimp_gradient_segment_range_split_uniform (const gchar *name,
G_TYPE_INT, split_parts,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-split-uniform",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-split-uniform",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-split-uniform",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1369,7 +1239,6 @@ gimp_gradient_segment_range_delete (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1380,13 +1249,9 @@ gimp_gradient_segment_range_delete (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1416,7 +1281,6 @@ gimp_gradient_segment_range_redistribute_handles (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1427,13 +1291,9 @@ gimp_gradient_segment_range_redistribute_handles (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-redistribute-handles",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-redistribute-handles",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-redistribute-handles",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1464,7 +1324,6 @@ gimp_gradient_segment_range_blend_colors (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1475,13 +1334,9 @@ gimp_gradient_segment_range_blend_colors (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-blend-colors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-blend-colors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-blend-colors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1512,7 +1367,6 @@ gimp_gradient_segment_range_blend_opacity (const gchar *name,
gint start_segment,
gint end_segment)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1523,13 +1377,9 @@ gimp_gradient_segment_range_blend_opacity (const gchar *name,
G_TYPE_INT, end_segment,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-blend-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-blend-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-blend-opacity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1564,7 +1414,6 @@ gimp_gradient_segment_range_move (const gchar *name,
gdouble delta,
gboolean control_compress)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble final_delta = 0.0;
@@ -1577,13 +1426,9 @@ gimp_gradient_segment_range_move (const gchar *name,
G_TYPE_BOOLEAN, control_compress,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradient-segment-range-move",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradient-segment-range-move",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradient-segment-range-move",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpgradients_pdb.c b/libgimp/gimpgradients_pdb.c
index 683e879cd2..b7c83de656 100644
--- a/libgimp/gimpgradients_pdb.c
+++ b/libgimp/gimpgradients_pdb.c
@@ -47,7 +47,6 @@
gboolean
gimp_gradients_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -55,13 +54,9 @@ gimp_gradients_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradients-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradients-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradients-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gchar **
gimp_gradients_get_list (const gchar *filter,
gint *num_gradients)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **gradient_list = NULL;
@@ -99,13 +93,9 @@ gimp_gradients_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradients-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradients-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradients-get-list",
+ args);
gimp_value_array_unref (args);
*num_gradients = 0;
diff --git a/libgimp/gimpgradientselect_pdb.c b/libgimp/gimpgradientselect_pdb.c
index adfb10b8cf..73102b36d6 100644
--- a/libgimp/gimpgradientselect_pdb.c
+++ b/libgimp/gimpgradientselect_pdb.c
@@ -53,7 +53,6 @@ gimp_gradients_popup (const gchar *gradient_callback,
const gchar *initial_gradient,
gint sample_size)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -65,13 +64,9 @@ gimp_gradients_popup (const gchar *gradient_callback,
G_TYPE_INT, sample_size,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradients-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradients-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradients-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -94,7 +89,6 @@ gimp_gradients_popup (const gchar *gradient_callback,
gboolean
gimp_gradients_close_popup (const gchar *gradient_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -103,13 +97,9 @@ gimp_gradients_close_popup (const gchar *gradient_callback)
G_TYPE_STRING, gradient_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradients-close-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradients-close-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradients-close-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -134,7 +124,6 @@ gboolean
gimp_gradients_set_popup (const gchar *gradient_callback,
const gchar *gradient_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -144,13 +133,9 @@ gimp_gradients_set_popup (const gchar *gradient_callback,
G_TYPE_STRING, gradient_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-gradients-set-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-gradients-set-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-gradients-set-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimphelp_pdb.c b/libgimp/gimphelp_pdb.c
index 66cb5d5f6e..d1f93067a3 100644
--- a/libgimp/gimphelp_pdb.c
+++ b/libgimp/gimphelp_pdb.c
@@ -54,7 +54,6 @@ gboolean
gimp_help (const gchar *help_domain,
const gchar *help_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -64,13 +63,9 @@ gimp_help (const gchar *help_domain,
G_TYPE_STRING, help_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-help",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-help",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-help",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimage.c b/libgimp/gimpimage.c
index 48084f1ece..afe67ee1d2 100644
--- a/libgimp/gimpimage.c
+++ b/libgimp/gimpimage.c
@@ -158,18 +158,10 @@ gimp_image_get_by_id (gint32 image_id)
{
if (image_id > 0)
{
- GimpPlugIn *plug_in = gimp_get_plug_in ();
+ GimpPlugIn *plug_in = gimp_get_plug_in ();
+ GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
- if (plug_in)
- {
- GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
-
- return _gimp_procedure_get_image (procedure, image_id);
- }
-
- return g_object_new (GIMP_TYPE_IMAGE,
- "id", image_id,
- NULL);
+ return _gimp_procedure_get_image (procedure, image_id);
}
return NULL;
diff --git a/libgimp/gimpimage_pdb.c b/libgimp/gimpimage_pdb.c
index 1e8650343c..0d2c1e8d45 100644
--- a/libgimp/gimpimage_pdb.c
+++ b/libgimp/gimpimage_pdb.c
@@ -51,7 +51,6 @@
gboolean
gimp_image_id_is_valid (gint image_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean valid = FALSE;
@@ -60,13 +59,9 @@ gimp_image_id_is_valid (gint image_id)
G_TYPE_INT, image_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-id-is-valid",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-id-is-valid",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-id-is-valid",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -92,7 +87,6 @@ gimp_image_id_is_valid (gint image_id)
gint *
_gimp_image_list (gint *num_images)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *image_ids = NULL;
@@ -100,13 +94,9 @@ _gimp_image_list (gint *num_images)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-list",
+ args);
gimp_value_array_unref (args);
*num_images = 0;
@@ -148,7 +138,6 @@ gimp_image_new (gint width,
gint height,
GimpImageBaseType type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -159,13 +148,9 @@ gimp_image_new (gint width,
GIMP_TYPE_IMAGE_BASE_TYPE, type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -201,7 +186,6 @@ gimp_image_new_with_precision (gint width,
GimpImageBaseType type,
GimpPrecision precision)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -213,13 +197,9 @@ gimp_image_new_with_precision (gint width,
GIMP_TYPE_PRECISION, precision,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-new-with-precision",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-new-with-precision",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-new-with-precision",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -244,7 +224,6 @@ gimp_image_new_with_precision (gint width,
GimpImage *
gimp_image_duplicate (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *new_image = NULL;
@@ -253,13 +232,9 @@ gimp_image_duplicate (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-duplicate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-duplicate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-duplicate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -288,7 +263,6 @@ gimp_image_duplicate (GimpImage *image)
gboolean
gimp_image_delete (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -297,13 +271,9 @@ gimp_image_delete (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -327,7 +297,6 @@ gimp_image_delete (GimpImage *image)
GimpImageBaseType
gimp_image_base_type (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImageBaseType base_type = 0;
@@ -336,13 +305,9 @@ gimp_image_base_type (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-base-type",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-base-type",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-base-type",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -368,7 +333,6 @@ gimp_image_base_type (GimpImage *image)
GimpPrecision
gimp_image_get_precision (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpPrecision precision = 0;
@@ -377,13 +341,9 @@ gimp_image_get_precision (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-precision",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-precision",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-precision",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -409,7 +369,6 @@ gimp_image_get_precision (GimpImage *image)
GimpLayerMode
gimp_image_get_default_new_layer_mode (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerMode mode = 0;
@@ -418,13 +377,9 @@ gimp_image_get_default_new_layer_mode (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-default-new-layer-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-default-new-layer-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-default-new-layer-mode",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -449,7 +404,6 @@ gimp_image_get_default_new_layer_mode (GimpImage *image)
gint
gimp_image_width (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint width = 0;
@@ -458,13 +412,9 @@ gimp_image_width (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-width",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-width",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-width",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -489,7 +439,6 @@ gimp_image_width (GimpImage *image)
gint
gimp_image_height (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint height = 0;
@@ -498,13 +447,9 @@ gimp_image_height (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-height",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-height",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-height",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -533,7 +478,6 @@ gint *
_gimp_image_get_layers (GimpImage *image,
gint *num_layers)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *layer_ids = NULL;
@@ -542,13 +486,9 @@ _gimp_image_get_layers (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-layers",
+ args);
gimp_value_array_unref (args);
*num_layers = 0;
@@ -585,7 +525,6 @@ gint *
_gimp_image_get_channels (GimpImage *image,
gint *num_channels)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *channel_ids = NULL;
@@ -594,13 +533,9 @@ _gimp_image_get_channels (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-channels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-channels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-channels",
+ args);
gimp_value_array_unref (args);
*num_channels = 0;
@@ -636,7 +571,6 @@ gint *
_gimp_image_get_vectors (GimpImage *image,
gint *num_vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *vector_ids = NULL;
@@ -645,13 +579,9 @@ _gimp_image_get_vectors (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-vectors",
+ args);
gimp_value_array_unref (args);
*num_vectors = 0;
@@ -685,7 +615,6 @@ _gimp_image_get_vectors (GimpImage *image,
GimpDrawable *
gimp_image_get_active_drawable (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpDrawable *drawable = NULL;
@@ -694,13 +623,9 @@ gimp_image_get_active_drawable (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-active-drawable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-active-drawable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-active-drawable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -727,7 +652,6 @@ gimp_image_get_active_drawable (GimpImage *image)
gboolean
gimp_image_unset_active_channel (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -736,13 +660,9 @@ gimp_image_unset_active_channel (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-unset-active-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-unset-active-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-unset-active-channel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -766,7 +686,6 @@ gimp_image_unset_active_channel (GimpImage *image)
GimpLayer *
gimp_image_get_floating_sel (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *floating_sel = NULL;
@@ -775,13 +694,9 @@ gimp_image_get_floating_sel (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-floating-sel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-floating-sel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-floating-sel",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -808,7 +723,6 @@ gimp_image_get_floating_sel (GimpImage *image)
GimpDrawable *
gimp_image_floating_sel_attached_to (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpDrawable *drawable = NULL;
@@ -817,13 +731,9 @@ gimp_image_floating_sel_attached_to (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-floating-sel-attached-to",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-floating-sel-attached-to",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-floating-sel-attached-to",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -871,7 +781,6 @@ gimp_image_pick_color (GimpImage *image,
gdouble average_radius,
GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -886,13 +795,9 @@ gimp_image_pick_color (GimpImage *image,
G_TYPE_DOUBLE, average_radius,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-pick-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-pick-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-pick-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -926,7 +831,6 @@ gimp_image_pick_correlate_layer (GimpImage *image,
gint x,
gint y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -937,13 +841,9 @@ gimp_image_pick_correlate_layer (GimpImage *image,
G_TYPE_INT, y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-pick-correlate-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-pick-correlate-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-pick-correlate-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -983,7 +883,6 @@ gimp_image_insert_layer (GimpImage *image,
GimpLayer *parent,
gint position)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -995,13 +894,9 @@ gimp_image_insert_layer (GimpImage *image,
G_TYPE_INT, position,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-insert-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-insert-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-insert-layer",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1030,7 +925,6 @@ gboolean
gimp_image_remove_layer (GimpImage *image,
GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1040,13 +934,9 @@ gimp_image_remove_layer (GimpImage *image,
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-remove-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-remove-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-remove-layer",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1077,7 +967,6 @@ gimp_image_remove_layer (GimpImage *image,
gboolean
gimp_image_freeze_layers (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1086,13 +975,9 @@ gimp_image_freeze_layers (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-freeze-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-freeze-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-freeze-layers",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1121,7 +1006,6 @@ gimp_image_freeze_layers (GimpImage *image)
gboolean
gimp_image_thaw_layers (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1130,13 +1014,9 @@ gimp_image_thaw_layers (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-thaw-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-thaw-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-thaw-layers",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1170,7 +1050,6 @@ gimp_image_insert_channel (GimpImage *image,
GimpChannel *parent,
gint position)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1182,13 +1061,9 @@ gimp_image_insert_channel (GimpImage *image,
G_TYPE_INT, position,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-insert-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-insert-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-insert-channel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1214,7 +1089,6 @@ gboolean
gimp_image_remove_channel (GimpImage *image,
GimpChannel *channel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1224,13 +1098,9 @@ gimp_image_remove_channel (GimpImage *image,
GIMP_TYPE_CHANNEL, channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-remove-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-remove-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-remove-channel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1262,7 +1132,6 @@ gimp_image_remove_channel (GimpImage *image,
gboolean
gimp_image_freeze_channels (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1271,13 +1140,9 @@ gimp_image_freeze_channels (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-freeze-channels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-freeze-channels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-freeze-channels",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1306,7 +1171,6 @@ gimp_image_freeze_channels (GimpImage *image)
gboolean
gimp_image_thaw_channels (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1315,13 +1179,9 @@ gimp_image_thaw_channels (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-thaw-channels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-thaw-channels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-thaw-channels",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1355,7 +1215,6 @@ gimp_image_insert_vectors (GimpImage *image,
GimpVectors *parent,
gint position)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1367,13 +1226,9 @@ gimp_image_insert_vectors (GimpImage *image,
G_TYPE_INT, position,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-insert-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-insert-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-insert-vectors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1401,7 +1256,6 @@ gboolean
gimp_image_remove_vectors (GimpImage *image,
GimpVectors *vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1411,13 +1265,9 @@ gimp_image_remove_vectors (GimpImage *image,
GIMP_TYPE_VECTORS, vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-remove-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-remove-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-remove-vectors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1449,7 +1299,6 @@ gimp_image_remove_vectors (GimpImage *image,
gboolean
gimp_image_freeze_vectors (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1458,13 +1307,9 @@ gimp_image_freeze_vectors (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-freeze-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-freeze-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-freeze-vectors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1493,7 +1338,6 @@ gimp_image_freeze_vectors (GimpImage *image)
gboolean
gimp_image_thaw_vectors (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1502,13 +1346,9 @@ gimp_image_thaw_vectors (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-thaw-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-thaw-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-thaw-vectors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1538,7 +1378,6 @@ gint
gimp_image_get_item_position (GimpImage *image,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint position = 0;
@@ -1548,13 +1387,9 @@ gimp_image_get_item_position (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-item-position",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-item-position",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-item-position",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1583,7 +1418,6 @@ gboolean
gimp_image_raise_item (GimpImage *image,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1593,13 +1427,9 @@ gimp_image_raise_item (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-raise-item",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-raise-item",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-raise-item",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1627,7 +1457,6 @@ gboolean
gimp_image_lower_item (GimpImage *image,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1637,13 +1466,9 @@ gimp_image_lower_item (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-lower-item",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-lower-item",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-lower-item",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1671,7 +1496,6 @@ gboolean
gimp_image_raise_item_to_top (GimpImage *image,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1681,13 +1505,9 @@ gimp_image_raise_item_to_top (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-raise-item-to-top",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-raise-item-to-top",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-raise-item-to-top",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1716,7 +1536,6 @@ gboolean
gimp_image_lower_item_to_bottom (GimpImage *image,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1726,13 +1545,9 @@ gimp_image_lower_item_to_bottom (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-lower-item-to-bottom",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-lower-item-to-bottom",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-lower-item-to-bottom",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1763,7 +1578,6 @@ gimp_image_reorder_item (GimpImage *image,
GimpItem *parent,
gint position)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1775,13 +1589,9 @@ gimp_image_reorder_item (GimpImage *image,
G_TYPE_INT, position,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-reorder-item",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-reorder-item",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-reorder-item",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1807,7 +1617,6 @@ gimp_image_reorder_item (GimpImage *image,
GimpLayer *
gimp_image_flatten (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -1816,13 +1625,9 @@ gimp_image_flatten (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-flatten",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-flatten",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-flatten",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1853,7 +1658,6 @@ GimpLayer *
gimp_image_merge_visible_layers (GimpImage *image,
GimpMergeType merge_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -1863,13 +1667,9 @@ gimp_image_merge_visible_layers (GimpImage *image,
GIMP_TYPE_MERGE_TYPE, merge_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-merge-visible-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-merge-visible-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-merge-visible-layers",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1903,7 +1703,6 @@ gimp_image_merge_down (GimpImage *image,
GimpLayer *merge_layer,
GimpMergeType merge_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -1914,13 +1713,9 @@ gimp_image_merge_down (GimpImage *image,
GIMP_TYPE_MERGE_TYPE, merge_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-merge-down",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-merge-down",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-merge-down",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1952,7 +1747,6 @@ guint8 *
_gimp_image_get_colormap (GimpImage *image,
gint *num_bytes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint8 *colormap = NULL;
@@ -1961,13 +1755,9 @@ _gimp_image_get_colormap (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-colormap",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-colormap",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-colormap",
+ args);
gimp_value_array_unref (args);
*num_bytes = 0;
@@ -2004,7 +1794,6 @@ _gimp_image_set_colormap (GimpImage *image,
gint num_bytes,
const guint8 *colormap)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2016,13 +1805,9 @@ _gimp_image_set_colormap (GimpImage *image,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 2), colormap, num_bytes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-colormap",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-colormap",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-colormap",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2046,7 +1831,6 @@ _gimp_image_set_colormap (GimpImage *image,
gchar *
_gimp_image_get_metadata (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *metadata_string = NULL;
@@ -2055,13 +1839,9 @@ _gimp_image_get_metadata (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-metadata",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-metadata",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-metadata",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2087,7 +1867,6 @@ gboolean
_gimp_image_set_metadata (GimpImage *image,
const gchar *metadata_string)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2097,13 +1876,9 @@ _gimp_image_set_metadata (GimpImage *image,
G_TYPE_STRING, metadata_string,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-metadata",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-metadata",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-metadata",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2131,7 +1906,6 @@ _gimp_image_set_metadata (GimpImage *image,
gboolean
gimp_image_clean_all (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2140,13 +1914,9 @@ gimp_image_clean_all (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-clean-all",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-clean-all",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-clean-all",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2172,7 +1942,6 @@ gimp_image_clean_all (GimpImage *image)
gboolean
gimp_image_is_dirty (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean dirty = FALSE;
@@ -2181,13 +1950,9 @@ gimp_image_is_dirty (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-is-dirty",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-is-dirty",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-is-dirty",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2228,7 +1993,6 @@ _gimp_image_thumbnail (GimpImage *image,
gint *thumbnail_data_count,
guint8 **thumbnail_data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2239,13 +2003,9 @@ _gimp_image_thumbnail (GimpImage *image,
G_TYPE_INT, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-thumbnail",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-thumbnail",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-thumbnail",
+ args);
gimp_value_array_unref (args);
*actual_width = 0;
@@ -2285,7 +2045,6 @@ _gimp_image_thumbnail (GimpImage *image,
GimpLayer *
gimp_image_get_active_layer (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *active_layer = NULL;
@@ -2294,13 +2053,9 @@ gimp_image_get_active_layer (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-active-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-active-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-active-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2329,7 +2084,6 @@ gboolean
gimp_image_set_active_layer (GimpImage *image,
GimpLayer *active_layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2339,13 +2093,9 @@ gimp_image_set_active_layer (GimpImage *image,
GIMP_TYPE_LAYER, active_layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-active-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-active-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-active-layer",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2369,7 +2119,6 @@ gimp_image_set_active_layer (GimpImage *image,
GimpChannel *
gimp_image_get_active_channel (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *active_channel = NULL;
@@ -2378,13 +2127,9 @@ gimp_image_get_active_channel (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-active-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-active-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-active-channel",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2413,7 +2158,6 @@ gboolean
gimp_image_set_active_channel (GimpImage *image,
GimpChannel *active_channel)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2423,13 +2167,9 @@ gimp_image_set_active_channel (GimpImage *image,
GIMP_TYPE_CHANNEL, active_channel,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-active-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-active-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-active-channel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2452,7 +2192,6 @@ gimp_image_set_active_channel (GimpImage *image,
GimpVectors *
gimp_image_get_active_vectors (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *active_vectors = NULL;
@@ -2461,13 +2200,9 @@ gimp_image_get_active_vectors (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-active-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-active-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-active-vectors",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2493,7 +2228,6 @@ gboolean
gimp_image_set_active_vectors (GimpImage *image,
GimpVectors *active_vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2503,13 +2237,9 @@ gimp_image_set_active_vectors (GimpImage *image,
GIMP_TYPE_VECTORS, active_vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-active-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-active-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-active-vectors",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2533,7 +2263,6 @@ gimp_image_set_active_vectors (GimpImage *image,
GimpSelection *
gimp_image_get_selection (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpSelection *selection = NULL;
@@ -2542,13 +2271,9 @@ gimp_image_get_selection (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-selection",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-selection",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-selection",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2577,7 +2302,6 @@ gboolean
gimp_image_get_component_active (GimpImage *image,
GimpChannelType component)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean active = FALSE;
@@ -2587,13 +2311,9 @@ gimp_image_get_component_active (GimpImage *image,
GIMP_TYPE_CHANNEL_TYPE, component,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-component-active",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-component-active",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-component-active",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2624,7 +2344,6 @@ gimp_image_set_component_active (GimpImage *image,
GimpChannelType component,
gboolean active)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2635,13 +2354,9 @@ gimp_image_set_component_active (GimpImage *image,
G_TYPE_BOOLEAN, active,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-component-active",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-component-active",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-component-active",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2670,7 +2385,6 @@ gboolean
gimp_image_get_component_visible (GimpImage *image,
GimpChannelType component)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean visible = FALSE;
@@ -2680,13 +2394,9 @@ gimp_image_get_component_visible (GimpImage *image,
GIMP_TYPE_CHANNEL_TYPE, component,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-component-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-component-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-component-visible",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2717,7 +2427,6 @@ gimp_image_set_component_visible (GimpImage *image,
GimpChannelType component,
gboolean visible)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2728,13 +2437,9 @@ gimp_image_set_component_visible (GimpImage *image,
G_TYPE_BOOLEAN, visible,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-component-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-component-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-component-visible",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2762,7 +2467,6 @@ gimp_image_set_component_visible (GimpImage *image,
gchar *
gimp_image_get_filename (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *filename = NULL;
@@ -2771,13 +2475,9 @@ gimp_image_get_filename (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-filename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-filename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-filename",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2804,7 +2504,6 @@ gboolean
gimp_image_set_filename (GimpImage *image,
const gchar *filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -2814,13 +2513,9 @@ gimp_image_set_filename (GimpImage *image,
G_TYPE_STRING, filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-filename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-filename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-filename",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -2852,7 +2547,6 @@ gimp_image_set_filename (GimpImage *image,
gchar *
gimp_image_get_uri (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *uri = NULL;
@@ -2861,13 +2555,9 @@ gimp_image_get_uri (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-uri",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-uri",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-uri",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2895,7 +2585,6 @@ gimp_image_get_uri (GimpImage *image)
gchar *
gimp_image_get_xcf_uri (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *uri = NULL;
@@ -2904,13 +2593,9 @@ gimp_image_get_xcf_uri (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-xcf-uri",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-xcf-uri",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-xcf-uri",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2940,7 +2625,6 @@ gimp_image_get_xcf_uri (GimpImage *image)
gchar *
gimp_image_get_imported_uri (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *uri = NULL;
@@ -2949,13 +2633,9 @@ gimp_image_get_imported_uri (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-imported-uri",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-imported-uri",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-imported-uri",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -2984,7 +2664,6 @@ gimp_image_get_imported_uri (GimpImage *image)
gchar *
gimp_image_get_exported_uri (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *uri = NULL;
@@ -2993,13 +2672,9 @@ gimp_image_get_exported_uri (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-exported-uri",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-exported-uri",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-exported-uri",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3030,7 +2705,6 @@ gimp_image_get_exported_uri (GimpImage *image)
gchar *
gimp_image_get_name (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -3039,13 +2713,9 @@ gimp_image_get_name (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3074,7 +2744,6 @@ gimp_image_get_resolution (GimpImage *image,
gdouble *xresolution,
gdouble *yresolution)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3083,13 +2752,9 @@ gimp_image_get_resolution (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-resolution",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-resolution",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-resolution",
+ args);
gimp_value_array_unref (args);
*xresolution = 0.0;
@@ -3127,7 +2792,6 @@ gimp_image_set_resolution (GimpImage *image,
gdouble xresolution,
gdouble yresolution)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3138,13 +2802,9 @@ gimp_image_set_resolution (GimpImage *image,
G_TYPE_DOUBLE, yresolution,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-resolution",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-resolution",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-resolution",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3170,7 +2830,6 @@ gimp_image_set_resolution (GimpImage *image,
GimpUnit
gimp_image_get_unit (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpUnit unit = GIMP_UNIT_PIXEL;
@@ -3179,13 +2838,9 @@ gimp_image_get_unit (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-unit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-unit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-unit",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3215,7 +2870,6 @@ gboolean
gimp_image_set_unit (GimpImage *image,
GimpUnit unit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3225,13 +2879,9 @@ gimp_image_set_unit (GimpImage *image,
GIMP_TYPE_UNIT, unit,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-unit",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-unit",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-unit",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3256,7 +2906,6 @@ gimp_image_set_unit (GimpImage *image,
guint
gimp_image_get_tattoo_state (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint tattoo_state = 0;
@@ -3265,13 +2914,9 @@ gimp_image_get_tattoo_state (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-tattoo-state",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-tattoo-state",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-tattoo-state",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3308,7 +2953,6 @@ gboolean
gimp_image_set_tattoo_state (GimpImage *image,
guint tattoo_state)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3318,13 +2962,9 @@ gimp_image_set_tattoo_state (GimpImage *image,
G_TYPE_UINT, tattoo_state,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-tattoo-state",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-tattoo-state",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-tattoo-state",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3350,7 +2990,6 @@ GimpLayer *
gimp_image_get_layer_by_tattoo (GimpImage *image,
guint tattoo)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -3360,13 +2999,9 @@ gimp_image_get_layer_by_tattoo (GimpImage *image,
G_TYPE_UINT, tattoo,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-layer-by-tattoo",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-layer-by-tattoo",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-layer-by-tattoo",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3393,7 +3028,6 @@ GimpChannel *
gimp_image_get_channel_by_tattoo (GimpImage *image,
guint tattoo)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel = NULL;
@@ -3403,13 +3037,9 @@ gimp_image_get_channel_by_tattoo (GimpImage *image,
G_TYPE_UINT, tattoo,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-channel-by-tattoo",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-channel-by-tattoo",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-channel-by-tattoo",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3438,7 +3068,6 @@ GimpVectors *
gimp_image_get_vectors_by_tattoo (GimpImage *image,
guint tattoo)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *vectors = NULL;
@@ -3448,13 +3077,9 @@ gimp_image_get_vectors_by_tattoo (GimpImage *image,
G_TYPE_UINT, tattoo,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-vectors-by-tattoo",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-vectors-by-tattoo",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-vectors-by-tattoo",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3483,7 +3108,6 @@ GimpLayer *
gimp_image_get_layer_by_name (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -3493,13 +3117,9 @@ gimp_image_get_layer_by_name (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-layer-by-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-layer-by-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-layer-by-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3528,7 +3148,6 @@ GimpChannel *
gimp_image_get_channel_by_name (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel = NULL;
@@ -3538,13 +3157,9 @@ gimp_image_get_channel_by_name (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-channel-by-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-channel-by-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-channel-by-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3573,7 +3188,6 @@ GimpVectors *
gimp_image_get_vectors_by_name (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *vectors = NULL;
@@ -3583,13 +3197,9 @@ gimp_image_get_vectors_by_name (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-vectors-by-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-vectors-by-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-vectors-by-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3618,7 +3228,6 @@ gboolean
gimp_image_attach_parasite (GimpImage *image,
const GimpParasite *parasite)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3628,13 +3237,9 @@ gimp_image_attach_parasite (GimpImage *image,
GIMP_TYPE_PARASITE, parasite,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-attach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-attach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-attach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3662,7 +3267,6 @@ gboolean
gimp_image_detach_parasite (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -3672,13 +3276,9 @@ gimp_image_detach_parasite (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-detach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-detach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-detach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -3706,7 +3306,6 @@ GimpParasite *
gimp_image_get_parasite (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpParasite *parasite = NULL;
@@ -3716,13 +3315,9 @@ gimp_image_get_parasite (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-parasite",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -3752,7 +3347,6 @@ gchar **
gimp_image_get_parasite_list (GimpImage *image,
gint *num_parasites)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **parasites = NULL;
@@ -3761,13 +3355,9 @@ gimp_image_get_parasite_list (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-parasite-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-parasite-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-parasite-list",
+ args);
gimp_value_array_unref (args);
*num_parasites = 0;
diff --git a/libgimp/gimpimagecolorprofile_pdb.c b/libgimp/gimpimagecolorprofile_pdb.c
index 0b97758416..a092a3aa7b 100644
--- a/libgimp/gimpimagecolorprofile_pdb.c
+++ b/libgimp/gimpimagecolorprofile_pdb.c
@@ -54,7 +54,6 @@ guint8 *
_gimp_image_get_color_profile (GimpImage *image,
gint *num_bytes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint8 *profile_data = NULL;
@@ -63,13 +62,9 @@ _gimp_image_get_color_profile (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-color-profile",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-color-profile",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-color-profile",
+ args);
gimp_value_array_unref (args);
*num_bytes = 0;
@@ -108,7 +103,6 @@ guint8 *
_gimp_image_get_effective_color_profile (GimpImage *image,
gint *num_bytes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint8 *profile_data = NULL;
@@ -117,13 +111,9 @@ _gimp_image_get_effective_color_profile (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-effective-color-profile",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-effective-color-profile",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-effective-color-profile",
+ args);
gimp_value_array_unref (args);
*num_bytes = 0;
@@ -162,7 +152,6 @@ _gimp_image_set_color_profile (GimpImage *image,
gint num_bytes,
const guint8 *color_profile)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -174,13 +163,9 @@ _gimp_image_set_color_profile (GimpImage *image,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 2), color_profile, num_bytes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-color-profile",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-color-profile",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-color-profile",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -212,7 +197,6 @@ gboolean
gimp_image_set_color_profile_from_file (GimpImage *image,
const gchar *uri)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -222,13 +206,9 @@ gimp_image_set_color_profile_from_file (GimpImage *image,
G_TYPE_STRING, uri,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-set-color-profile-from-file",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-set-color-profile-from-file",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-set-color-profile-from-file",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -264,7 +244,6 @@ _gimp_image_convert_color_profile (GimpImage *image,
GimpColorRenderingIntent intent,
gboolean bpc)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -278,13 +257,9 @@ _gimp_image_convert_color_profile (GimpImage *image,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 2), color_profile, num_bytes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-color-profile",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-color-profile",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-color-profile",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -318,7 +293,6 @@ gimp_image_convert_color_profile_from_file (GimpImage *image,
GimpColorRenderingIntent intent,
gboolean bpc)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -330,13 +304,9 @@ gimp_image_convert_color_profile_from_file (GimpImage *image,
G_TYPE_BOOLEAN, bpc,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-color-profile-from-file",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-color-profile-from-file",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-color-profile-from-file",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimageconvert_pdb.c b/libgimp/gimpimageconvert_pdb.c
index 512ac3ed36..8b6a141209 100644
--- a/libgimp/gimpimageconvert_pdb.c
+++ b/libgimp/gimpimageconvert_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_image_convert_rgb (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -59,13 +58,9 @@ gimp_image_convert_rgb (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-rgb",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-rgb",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-rgb",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -89,7 +84,6 @@ gimp_image_convert_rgb (GimpImage *image)
gboolean
gimp_image_convert_grayscale (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -98,13 +92,9 @@ gimp_image_convert_grayscale (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-grayscale",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-grayscale",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-grayscale",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -151,7 +141,6 @@ gimp_image_convert_indexed (GimpImage *image,
gboolean remove_unused,
const gchar *palette)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -166,13 +155,9 @@ gimp_image_convert_indexed (GimpImage *image,
G_TYPE_STRING, palette,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-indexed",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-indexed",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-indexed",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -204,7 +189,6 @@ gimp_image_convert_set_dither_matrix (gint width,
gint matrix_length,
const guint8 *matrix)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -217,13 +201,9 @@ gimp_image_convert_set_dither_matrix (gint width,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 3), matrix, matrix_length);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-set-dither-matrix",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-set-dither-matrix",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-set-dither-matrix",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -252,7 +232,6 @@ gboolean
gimp_image_convert_precision (GimpImage *image,
GimpPrecision precision)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -262,13 +241,9 @@ gimp_image_convert_precision (GimpImage *image,
GIMP_TYPE_PRECISION, precision,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-convert-precision",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-convert-precision",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-convert-precision",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimagegrid_pdb.c b/libgimp/gimpimagegrid_pdb.c
index 219955b835..a7c98b9e28 100644
--- a/libgimp/gimpimagegrid_pdb.c
+++ b/libgimp/gimpimagegrid_pdb.c
@@ -54,7 +54,6 @@ gimp_image_grid_get_spacing (GimpImage *image,
gdouble *xspacing,
gdouble *yspacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -63,13 +62,9 @@ gimp_image_grid_get_spacing (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-get-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-get-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-get-spacing",
+ args);
gimp_value_array_unref (args);
*xspacing = 0.0;
@@ -108,7 +103,6 @@ gimp_image_grid_set_spacing (GimpImage *image,
gdouble xspacing,
gdouble yspacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -119,13 +113,9 @@ gimp_image_grid_set_spacing (GimpImage *image,
G_TYPE_DOUBLE, yspacing,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-set-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-set-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-set-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -155,7 +145,6 @@ gimp_image_grid_get_offset (GimpImage *image,
gdouble *xoffset,
gdouble *yoffset)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -164,13 +153,9 @@ gimp_image_grid_get_offset (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-get-offset",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-get-offset",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-get-offset",
+ args);
gimp_value_array_unref (args);
*xoffset = 0.0;
@@ -209,7 +194,6 @@ gimp_image_grid_set_offset (GimpImage *image,
gdouble xoffset,
gdouble yoffset)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -220,13 +204,9 @@ gimp_image_grid_set_offset (GimpImage *image,
G_TYPE_DOUBLE, yoffset,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-set-offset",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-set-offset",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-set-offset",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -253,7 +233,6 @@ gboolean
gimp_image_grid_get_foreground_color (GimpImage *image,
GimpRGB *fgcolor)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -262,13 +241,9 @@ gimp_image_grid_get_foreground_color (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-get-foreground-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-get-foreground-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-get-foreground-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -298,7 +273,6 @@ gboolean
gimp_image_grid_set_foreground_color (GimpImage *image,
const GimpRGB *fgcolor)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -308,13 +282,9 @@ gimp_image_grid_set_foreground_color (GimpImage *image,
GIMP_TYPE_RGB, fgcolor,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-set-foreground-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-set-foreground-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-set-foreground-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -341,7 +311,6 @@ gboolean
gimp_image_grid_get_background_color (GimpImage *image,
GimpRGB *bgcolor)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -350,13 +319,9 @@ gimp_image_grid_get_background_color (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-get-background-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-get-background-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-get-background-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -386,7 +351,6 @@ gboolean
gimp_image_grid_set_background_color (GimpImage *image,
const GimpRGB *bgcolor)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -396,13 +360,9 @@ gimp_image_grid_set_background_color (GimpImage *image,
GIMP_TYPE_RGB, bgcolor,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-set-background-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-set-background-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-set-background-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -427,7 +387,6 @@ gimp_image_grid_set_background_color (GimpImage *image,
GimpGridStyle
gimp_image_grid_get_style (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpGridStyle style = 0;
@@ -436,13 +395,9 @@ gimp_image_grid_get_style (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-get-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-get-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-get-style",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -471,7 +426,6 @@ gboolean
gimp_image_grid_set_style (GimpImage *image,
GimpGridStyle style)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -481,13 +435,9 @@ gimp_image_grid_set_style (GimpImage *image,
GIMP_TYPE_GRID_STYLE, style,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-grid-set-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-grid-set-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-grid-set-style",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimageguides_pdb.c b/libgimp/gimpimageguides_pdb.c
index 42814fb0ce..7636919cfb 100644
--- a/libgimp/gimpimageguides_pdb.c
+++ b/libgimp/gimpimageguides_pdb.c
@@ -51,7 +51,6 @@ guint
gimp_image_add_hguide (GimpImage *image,
gint yposition)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint guide = 0;
@@ -61,13 +60,9 @@ gimp_image_add_hguide (GimpImage *image,
G_TYPE_INT, yposition,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-add-hguide",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-add-hguide",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-add-hguide",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -95,7 +90,6 @@ guint
gimp_image_add_vguide (GimpImage *image,
gint xposition)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint guide = 0;
@@ -105,13 +99,9 @@ gimp_image_add_vguide (GimpImage *image,
G_TYPE_INT, xposition,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-add-vguide",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-add-vguide",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-add-vguide",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -138,7 +128,6 @@ gboolean
gimp_image_delete_guide (GimpImage *image,
guint guide)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -148,13 +137,9 @@ gimp_image_delete_guide (GimpImage *image,
G_TYPE_UINT, guide,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-delete-guide",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-delete-guide",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-delete-guide",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -183,7 +168,6 @@ guint
gimp_image_find_next_guide (GimpImage *image,
guint guide)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint next_guide = 0;
@@ -193,13 +177,9 @@ gimp_image_find_next_guide (GimpImage *image,
G_TYPE_UINT, guide,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-find-next-guide",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-find-next-guide",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-find-next-guide",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -226,7 +206,6 @@ GimpOrientationType
gimp_image_get_guide_orientation (GimpImage *image,
guint guide)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpOrientationType orientation = GIMP_ORIENTATION_UNKNOWN;
@@ -236,13 +215,9 @@ gimp_image_get_guide_orientation (GimpImage *image,
G_TYPE_UINT, guide,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-guide-orientation",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-guide-orientation",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-guide-orientation",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -269,7 +244,6 @@ gint
gimp_image_get_guide_position (GimpImage *image,
guint guide)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint position = G_MININT /* GIMP_GUIDE_POSITION_UNDEFINED */;
@@ -279,13 +253,9 @@ gimp_image_get_guide_position (GimpImage *image,
G_TYPE_UINT, guide,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-guide-position",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-guide-position",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-guide-position",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpimagesamplepoints_pdb.c b/libgimp/gimpimagesamplepoints_pdb.c
index 8384382c1b..a01d563bd5 100644
--- a/libgimp/gimpimagesamplepoints_pdb.c
+++ b/libgimp/gimpimagesamplepoints_pdb.c
@@ -55,7 +55,6 @@ gimp_image_add_sample_point (GimpImage *image,
gint position_x,
gint position_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint sample_point = 0;
@@ -66,13 +65,9 @@ gimp_image_add_sample_point (GimpImage *image,
G_TYPE_INT, position_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-add-sample-point",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-add-sample-point",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-add-sample-point",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -101,7 +96,6 @@ gboolean
gimp_image_delete_sample_point (GimpImage *image,
guint sample_point)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -111,13 +105,9 @@ gimp_image_delete_sample_point (GimpImage *image,
G_TYPE_UINT, sample_point,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-delete-sample-point",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-delete-sample-point",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-delete-sample-point",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -149,7 +139,6 @@ guint
gimp_image_find_next_sample_point (GimpImage *image,
guint sample_point)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint next_sample_point = 0;
@@ -159,13 +148,9 @@ gimp_image_find_next_sample_point (GimpImage *image,
G_TYPE_UINT, sample_point,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-find-next-sample-point",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-find-next-sample-point",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-find-next-sample-point",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -197,7 +182,6 @@ gimp_image_get_sample_point_position (GimpImage *image,
guint sample_point,
gint *position_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint position_x = G_MININT;
@@ -207,13 +191,9 @@ gimp_image_get_sample_point_position (GimpImage *image,
G_TYPE_UINT, sample_point,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-get-sample-point-position",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-get-sample-point-position",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-get-sample-point-position",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpimageselect_pdb.c b/libgimp/gimpimageselect_pdb.c
index 1f1cf2e9f6..e8d14391f2 100644
--- a/libgimp/gimpimageselect_pdb.c
+++ b/libgimp/gimpimageselect_pdb.c
@@ -71,7 +71,6 @@ gimp_image_select_color (GimpImage *image,
GimpDrawable *drawable,
const GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -83,13 +82,9 @@ gimp_image_select_color (GimpImage *image,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -147,7 +142,6 @@ gimp_image_select_contiguous_color (GimpImage *image,
gdouble x,
gdouble y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -160,13 +154,9 @@ gimp_image_select_contiguous_color (GimpImage *image,
G_TYPE_DOUBLE, y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-contiguous-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-contiguous-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-contiguous-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -206,7 +196,6 @@ gimp_image_select_rectangle (GimpImage *image,
gdouble width,
gdouble height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -220,13 +209,9 @@ gimp_image_select_rectangle (GimpImage *image,
G_TYPE_DOUBLE, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-rectangle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-rectangle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-rectangle",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -273,7 +258,6 @@ gimp_image_select_round_rectangle (GimpImage *image,
gdouble corner_radius_x,
gdouble corner_radius_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -289,13 +273,9 @@ gimp_image_select_round_rectangle (GimpImage *image,
G_TYPE_DOUBLE, corner_radius_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-round-rectangle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-round-rectangle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-round-rectangle",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -336,7 +316,6 @@ gimp_image_select_ellipse (GimpImage *image,
gdouble width,
gdouble height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -350,13 +329,9 @@ gimp_image_select_ellipse (GimpImage *image,
G_TYPE_DOUBLE, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-ellipse",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-ellipse",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-ellipse",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -398,7 +373,6 @@ gimp_image_select_polygon (GimpImage *image,
gint num_segs,
const gdouble *segs)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -411,13 +385,9 @@ gimp_image_select_polygon (GimpImage *image,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), segs, num_segs);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-polygon",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-polygon",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-polygon",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -453,7 +423,6 @@ gimp_image_select_item (GimpImage *image,
GimpChannelOps operation,
GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -464,13 +433,9 @@ gimp_image_select_item (GimpImage *image,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-select-item",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-select-item",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-select-item",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimagetransform_pdb.c b/libgimp/gimpimagetransform_pdb.c
index 079a267977..96e1b75594 100644
--- a/libgimp/gimpimagetransform_pdb.c
+++ b/libgimp/gimpimagetransform_pdb.c
@@ -61,7 +61,6 @@ gimp_image_resize (GimpImage *image,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -74,13 +73,9 @@ gimp_image_resize (GimpImage *image,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-resize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-resize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-resize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -108,7 +103,6 @@ gimp_image_resize (GimpImage *image,
gboolean
gimp_image_resize_to_layers (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -117,13 +111,9 @@ gimp_image_resize_to_layers (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-resize-to-layers",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-resize-to-layers",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-resize-to-layers",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -154,7 +144,6 @@ gimp_image_scale (GimpImage *image,
gint new_width,
gint new_height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -165,13 +154,9 @@ gimp_image_scale (GimpImage *image,
G_TYPE_INT, new_height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-scale",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-scale",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-scale",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -207,7 +192,6 @@ gimp_image_crop (GimpImage *image,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -220,13 +204,9 @@ gimp_image_crop (GimpImage *image,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-crop",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-crop",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-crop",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -251,7 +231,6 @@ gboolean
gimp_image_flip (GimpImage *image,
GimpOrientationType flip_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -261,13 +240,9 @@ gimp_image_flip (GimpImage *image,
GIMP_TYPE_ORIENTATION_TYPE, flip_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-flip",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-flip",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-flip",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -292,7 +267,6 @@ gboolean
gimp_image_rotate (GimpImage *image,
GimpRotationType rotate_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -302,13 +276,9 @@ gimp_image_rotate (GimpImage *image,
GIMP_TYPE_ROTATION_TYPE, rotate_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-rotate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-rotate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-rotate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpimageundo_pdb.c b/libgimp/gimpimageundo_pdb.c
index f21ec62d8b..bc2f506c54 100644
--- a/libgimp/gimpimageundo_pdb.c
+++ b/libgimp/gimpimageundo_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_image_undo_group_start (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -59,13 +58,9 @@ gimp_image_undo_group_start (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-group-start",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-group-start",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-group-start",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -89,7 +84,6 @@ gimp_image_undo_group_start (GimpImage *image)
gboolean
gimp_image_undo_group_end (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -98,13 +92,9 @@ gimp_image_undo_group_end (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-group-end",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-group-end",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-group-end",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -130,7 +120,6 @@ gimp_image_undo_group_end (GimpImage *image)
gboolean
gimp_image_undo_is_enabled (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean enabled = FALSE;
@@ -139,13 +128,9 @@ gimp_image_undo_is_enabled (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-is-enabled",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-is-enabled",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-is-enabled",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -173,7 +158,6 @@ gimp_image_undo_is_enabled (GimpImage *image)
gboolean
gimp_image_undo_disable (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean disabled = FALSE;
@@ -182,13 +166,9 @@ gimp_image_undo_disable (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-disable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-disable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-disable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -215,7 +195,6 @@ gimp_image_undo_disable (GimpImage *image)
gboolean
gimp_image_undo_enable (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean enabled = FALSE;
@@ -224,13 +203,9 @@ gimp_image_undo_enable (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-enable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-enable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-enable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -264,7 +239,6 @@ gimp_image_undo_enable (GimpImage *image)
gboolean
gimp_image_undo_freeze (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean frozen = FALSE;
@@ -273,13 +247,9 @@ gimp_image_undo_freeze (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-freeze",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-freeze",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-freeze",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -312,7 +282,6 @@ gimp_image_undo_freeze (GimpImage *image)
gboolean
gimp_image_undo_thaw (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean thawed = FALSE;
@@ -321,13 +290,9 @@ gimp_image_undo_thaw (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-image-undo-thaw",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-image-undo-thaw",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-image-undo-thaw",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpitem.c b/libgimp/gimpitem.c
index e88e1c6a14..8224a707dd 100644
--- a/libgimp/gimpitem.c
+++ b/libgimp/gimpitem.c
@@ -163,45 +163,10 @@ gimp_item_get_by_id (gint32 item_id)
{
if (item_id > 0)
{
- GimpPlugIn *plug_in = gimp_get_plug_in ();
-
- if (plug_in)
- {
- GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
-
- return _gimp_procedure_get_item (procedure, item_id);
- }
-
- if (gimp_item_id_is_layer (item_id))
- {
- return g_object_new (GIMP_TYPE_LAYER,
- "id", item_id,
- NULL);
- }
- else if (gimp_item_id_is_layer_mask (item_id))
- {
- return g_object_new (GIMP_TYPE_LAYER_MASK,
- "id", item_id,
- NULL);
- }
- else if (gimp_item_id_is_selection (item_id))
- {
- return g_object_new (GIMP_TYPE_SELECTION,
- "id", item_id,
- NULL);
- }
- else if (gimp_item_id_is_channel (item_id))
- {
- return g_object_new (GIMP_TYPE_CHANNEL,
- "id", item_id,
- NULL);
- }
- else if (gimp_item_id_is_vectors (item_id))
- {
- return g_object_new (GIMP_TYPE_VECTORS,
- "id", item_id,
- NULL);
- }
+ GimpPlugIn *plug_in = gimp_get_plug_in ();
+ GimpProcedure *procedure = _gimp_plug_in_get_procedure (plug_in);
+
+ return _gimp_procedure_get_item (procedure, item_id);
}
return NULL;
diff --git a/libgimp/gimpitem_pdb.c b/libgimp/gimpitem_pdb.c
index f098698a91..11d37fac00 100644
--- a/libgimp/gimpitem_pdb.c
+++ b/libgimp/gimpitem_pdb.c
@@ -50,7 +50,6 @@
gboolean
gimp_item_id_is_valid (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean valid = FALSE;
@@ -59,13 +58,9 @@ gimp_item_id_is_valid (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-valid",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-valid",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-valid",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -91,7 +86,6 @@ gimp_item_id_is_valid (gint item_id)
gboolean
gimp_item_id_is_drawable (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean drawable = FALSE;
@@ -100,13 +94,9 @@ gimp_item_id_is_drawable (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-drawable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-drawable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-drawable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -132,7 +122,6 @@ gimp_item_id_is_drawable (gint item_id)
gboolean
gimp_item_id_is_layer (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean layer = FALSE;
@@ -141,13 +130,9 @@ gimp_item_id_is_layer (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -174,7 +159,6 @@ gimp_item_id_is_layer (gint item_id)
gboolean
gimp_item_id_is_text_layer (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean text_layer = FALSE;
@@ -183,13 +167,9 @@ gimp_item_id_is_text_layer (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-text-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-text-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-text-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -215,7 +195,6 @@ gimp_item_id_is_text_layer (gint item_id)
gboolean
gimp_item_id_is_channel (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean channel = FALSE;
@@ -224,13 +203,9 @@ gimp_item_id_is_channel (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-channel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-channel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-channel",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -257,7 +232,6 @@ gimp_item_id_is_channel (gint item_id)
gboolean
gimp_item_id_is_layer_mask (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean layer_mask = FALSE;
@@ -266,13 +240,9 @@ gimp_item_id_is_layer_mask (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-layer-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-layer-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-layer-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -298,7 +268,6 @@ gimp_item_id_is_layer_mask (gint item_id)
gboolean
gimp_item_id_is_selection (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean selection = FALSE;
@@ -307,13 +276,9 @@ gimp_item_id_is_selection (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-selection",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-selection",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-selection",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -339,7 +304,6 @@ gimp_item_id_is_selection (gint item_id)
gboolean
gimp_item_id_is_vectors (gint item_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean vectors = FALSE;
@@ -348,13 +312,9 @@ gimp_item_id_is_vectors (gint item_id)
G_TYPE_INT, item_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-id-is-vectors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-id-is-vectors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-id-is-vectors",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -380,7 +340,6 @@ gimp_item_id_is_vectors (gint item_id)
GimpImage *
gimp_item_get_image (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpImage *image = NULL;
@@ -389,13 +348,9 @@ gimp_item_get_image (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-image",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-image",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-image",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -425,7 +380,6 @@ gimp_item_get_image (GimpItem *item)
gboolean
gimp_item_delete (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -434,13 +388,9 @@ gimp_item_delete (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -466,7 +416,6 @@ gimp_item_delete (GimpItem *item)
gboolean
gimp_item_is_group (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean group = FALSE;
@@ -475,13 +424,9 @@ gimp_item_is_group (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-is-group",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-is-group",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-is-group",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -507,7 +452,6 @@ gimp_item_is_group (GimpItem *item)
GimpItem *
gimp_item_get_parent (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *parent = NULL;
@@ -516,13 +460,9 @@ gimp_item_get_parent (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-parent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-parent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-parent",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -553,7 +493,6 @@ gint *
_gimp_item_get_children (GimpItem *item,
gint *num_children)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *child_ids = NULL;
@@ -562,13 +501,9 @@ _gimp_item_get_children (GimpItem *item,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-children",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-children",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-children",
+ args);
gimp_value_array_unref (args);
*num_children = 0;
@@ -599,7 +534,6 @@ _gimp_item_get_children (GimpItem *item,
gboolean
gimp_item_get_expanded (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean expanded = FALSE;
@@ -608,13 +542,9 @@ gimp_item_get_expanded (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-expanded",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-expanded",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-expanded",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -642,7 +572,6 @@ gboolean
gimp_item_set_expanded (GimpItem *item,
gboolean expanded)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -652,13 +581,9 @@ gimp_item_set_expanded (GimpItem *item,
G_TYPE_BOOLEAN, expanded,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-expanded",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-expanded",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-expanded",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -684,7 +609,6 @@ gimp_item_set_expanded (GimpItem *item,
gchar *
gimp_item_get_name (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *name = NULL;
@@ -693,13 +617,9 @@ gimp_item_get_name (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -727,7 +647,6 @@ gboolean
gimp_item_set_name (GimpItem *item,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -737,13 +656,9 @@ gimp_item_set_name (GimpItem *item,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-name",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -768,7 +683,6 @@ gimp_item_set_name (GimpItem *item,
gboolean
gimp_item_get_visible (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean visible = FALSE;
@@ -777,13 +691,9 @@ gimp_item_get_visible (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-visible",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -811,7 +721,6 @@ gboolean
gimp_item_set_visible (GimpItem *item,
gboolean visible)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -821,13 +730,9 @@ gimp_item_set_visible (GimpItem *item,
G_TYPE_BOOLEAN, visible,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-visible",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -852,7 +757,6 @@ gimp_item_set_visible (GimpItem *item,
gboolean
gimp_item_get_linked (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean linked = FALSE;
@@ -861,13 +765,9 @@ gimp_item_get_linked (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-linked",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-linked",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-linked",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -895,7 +795,6 @@ gboolean
gimp_item_set_linked (GimpItem *item,
gboolean linked)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -905,13 +804,9 @@ gimp_item_set_linked (GimpItem *item,
G_TYPE_BOOLEAN, linked,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-linked",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-linked",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-linked",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -936,7 +831,6 @@ gimp_item_set_linked (GimpItem *item,
gboolean
gimp_item_get_lock_content (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean lock_content = FALSE;
@@ -945,13 +839,9 @@ gimp_item_get_lock_content (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-lock-content",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-lock-content",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-lock-content",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -979,7 +869,6 @@ gboolean
gimp_item_set_lock_content (GimpItem *item,
gboolean lock_content)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -989,13 +878,9 @@ gimp_item_set_lock_content (GimpItem *item,
G_TYPE_BOOLEAN, lock_content,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-lock-content",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-lock-content",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-lock-content",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1020,7 +905,6 @@ gimp_item_set_lock_content (GimpItem *item,
gboolean
gimp_item_get_lock_position (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean lock_position = FALSE;
@@ -1029,13 +913,9 @@ gimp_item_get_lock_position (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-lock-position",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-lock-position",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-lock-position",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1063,7 +943,6 @@ gboolean
gimp_item_set_lock_position (GimpItem *item,
gboolean lock_position)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1073,13 +952,9 @@ gimp_item_set_lock_position (GimpItem *item,
G_TYPE_BOOLEAN, lock_position,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-lock-position",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-lock-position",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-lock-position",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1104,7 +979,6 @@ gimp_item_set_lock_position (GimpItem *item,
GimpColorTag
gimp_item_get_color_tag (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpColorTag color_tag = 0;
@@ -1113,13 +987,9 @@ gimp_item_get_color_tag (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-color-tag",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-color-tag",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-color-tag",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1147,7 +1017,6 @@ gboolean
gimp_item_set_color_tag (GimpItem *item,
GimpColorTag color_tag)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1157,13 +1026,9 @@ gimp_item_set_color_tag (GimpItem *item,
GIMP_TYPE_COLOR_TAG, color_tag,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-color-tag",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-color-tag",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-color-tag",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1190,7 +1055,6 @@ gimp_item_set_color_tag (GimpItem *item,
guint
gimp_item_get_tattoo (GimpItem *item)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
guint tattoo = 0;
@@ -1199,13 +1063,9 @@ gimp_item_get_tattoo (GimpItem *item)
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-tattoo",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-tattoo",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-tattoo",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1235,7 +1095,6 @@ gboolean
gimp_item_set_tattoo (GimpItem *item,
guint tattoo)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1245,13 +1104,9 @@ gimp_item_set_tattoo (GimpItem *item,
G_TYPE_UINT, tattoo,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-set-tattoo",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-set-tattoo",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-set-tattoo",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1279,7 +1134,6 @@ gboolean
gimp_item_attach_parasite (GimpItem *item,
const GimpParasite *parasite)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1289,13 +1143,9 @@ gimp_item_attach_parasite (GimpItem *item,
GIMP_TYPE_PARASITE, parasite,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-attach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-attach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-attach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1323,7 +1173,6 @@ gboolean
gimp_item_detach_parasite (GimpItem *item,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1333,13 +1182,9 @@ gimp_item_detach_parasite (GimpItem *item,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-detach-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-detach-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-detach-parasite",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1366,7 +1211,6 @@ GimpParasite *
gimp_item_get_parasite (GimpItem *item,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpParasite *parasite = NULL;
@@ -1376,13 +1220,9 @@ gimp_item_get_parasite (GimpItem *item,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-parasite",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-parasite",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-parasite",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1412,7 +1252,6 @@ gchar **
gimp_item_get_parasite_list (GimpItem *item,
gint *num_parasites)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **parasites = NULL;
@@ -1421,13 +1260,9 @@ gimp_item_get_parasite_list (GimpItem *item,
GIMP_TYPE_ITEM, item,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-get-parasite-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-get-parasite-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-get-parasite-list",
+ args);
gimp_value_array_unref (args);
*num_parasites = 0;
diff --git a/libgimp/gimpitemtransform_pdb.c b/libgimp/gimpitemtransform_pdb.c
index 93430894d0..821f463400 100644
--- a/libgimp/gimpitemtransform_pdb.c
+++ b/libgimp/gimpitemtransform_pdb.c
@@ -61,7 +61,6 @@ gimp_item_transform_translate (GimpItem *item,
gdouble off_x,
gdouble off_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -72,13 +71,9 @@ gimp_item_transform_translate (GimpItem *item,
G_TYPE_DOUBLE, off_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-translate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-translate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-translate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -128,7 +123,6 @@ gimp_item_transform_flip_simple (GimpItem *item,
gboolean auto_center,
gdouble axis)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -140,13 +134,9 @@ gimp_item_transform_flip_simple (GimpItem *item,
G_TYPE_DOUBLE, axis,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-flip-simple",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-flip-simple",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-flip-simple",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -198,7 +188,6 @@ gimp_item_transform_flip (GimpItem *item,
gdouble x1,
gdouble y1)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -211,13 +200,9 @@ gimp_item_transform_flip (GimpItem *item,
G_TYPE_DOUBLE, y1,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-flip",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-flip",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-flip",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -286,7 +271,6 @@ gimp_item_transform_perspective (GimpItem *item,
gdouble x3,
gdouble y3)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -303,13 +287,9 @@ gimp_item_transform_perspective (GimpItem *item,
G_TYPE_DOUBLE, y3,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-perspective",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-perspective",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-perspective",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -364,7 +344,6 @@ gimp_item_transform_rotate_simple (GimpItem *item,
gdouble center_x,
gdouble center_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -377,13 +356,9 @@ gimp_item_transform_rotate_simple (GimpItem *item,
G_TYPE_DOUBLE, center_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-rotate-simple",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-rotate-simple",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-rotate-simple",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -440,7 +415,6 @@ gimp_item_transform_rotate (GimpItem *item,
gdouble center_x,
gdouble center_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -453,13 +427,9 @@ gimp_item_transform_rotate (GimpItem *item,
G_TYPE_DOUBLE, center_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-rotate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-rotate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-rotate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -513,7 +483,6 @@ gimp_item_transform_scale (GimpItem *item,
gdouble x1,
gdouble y1)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -526,13 +495,9 @@ gimp_item_transform_scale (GimpItem *item,
G_TYPE_DOUBLE, y1,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-scale",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-scale",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-scale",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -584,7 +549,6 @@ gimp_item_transform_shear (GimpItem *item,
GimpOrientationType shear_type,
gdouble magnitude)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -595,13 +559,9 @@ gimp_item_transform_shear (GimpItem *item,
G_TYPE_DOUBLE, magnitude,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-shear",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-shear",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-shear",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -664,7 +624,6 @@ gimp_item_transform_2d (GimpItem *item,
gdouble dest_x,
gdouble dest_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -680,13 +639,9 @@ gimp_item_transform_2d (GimpItem *item,
G_TYPE_DOUBLE, dest_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-2d",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-2d",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-2d",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -751,7 +706,6 @@ gimp_item_transform_matrix (GimpItem *item,
gdouble coeff_2_1,
gdouble coeff_2_2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpItem *ret_item = NULL;
@@ -769,13 +723,9 @@ gimp_item_transform_matrix (GimpItem *item,
G_TYPE_DOUBLE, coeff_2_2,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-item-transform-matrix",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-item-transform-matrix",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-item-transform-matrix",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimplayer_pdb.c b/libgimp/gimplayer_pdb.c
index 546eb00a45..bb455cb6f6 100644
--- a/libgimp/gimplayer_pdb.c
+++ b/libgimp/gimplayer_pdb.c
@@ -64,7 +64,6 @@ _gimp_layer_new (GimpImage *image,
gdouble opacity,
GimpLayerMode mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -79,13 +78,9 @@ _gimp_layer_new (GimpImage *image,
GIMP_TYPE_LAYER_MODE, mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -119,7 +114,6 @@ gimp_layer_new_from_visible (GimpImage *image,
GimpImage *dest_image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -130,13 +124,9 @@ gimp_layer_new_from_visible (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-new-from-visible",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-new-from-visible",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-new-from-visible",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -166,7 +156,6 @@ GimpLayer *
gimp_layer_new_from_drawable (GimpDrawable *drawable,
GimpImage *dest_image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer_copy = NULL;
@@ -176,13 +165,9 @@ gimp_layer_new_from_drawable (GimpDrawable *drawable,
GIMP_TYPE_IMAGE, dest_image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-new-from-drawable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-new-from-drawable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-new-from-drawable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -214,7 +199,6 @@ gimp_layer_new_from_drawable (GimpDrawable *drawable,
GimpLayer *
gimp_layer_group_new (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer_group = NULL;
@@ -223,13 +207,9 @@ gimp_layer_group_new (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-group-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-group-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-group-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -260,7 +240,6 @@ GimpLayer *
_gimp_layer_copy (GimpLayer *layer,
gboolean add_alpha)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer_copy = NULL;
@@ -270,13 +249,9 @@ _gimp_layer_copy (GimpLayer *layer,
G_TYPE_BOOLEAN, add_alpha,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-copy",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-copy",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-copy",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -304,7 +279,6 @@ _gimp_layer_copy (GimpLayer *layer,
gboolean
gimp_layer_add_alpha (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -313,13 +287,9 @@ gimp_layer_add_alpha (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-add-alpha",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-add-alpha",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-add-alpha",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -347,7 +317,6 @@ gimp_layer_add_alpha (GimpLayer *layer)
gboolean
gimp_layer_flatten (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -356,13 +325,9 @@ gimp_layer_flatten (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-flatten",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-flatten",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-flatten",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -396,7 +361,6 @@ gimp_layer_scale (GimpLayer *layer,
gint new_height,
gboolean local_origin)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -408,13 +372,9 @@ gimp_layer_scale (GimpLayer *layer,
G_TYPE_BOOLEAN, local_origin,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-scale",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-scale",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-scale",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -448,7 +408,6 @@ gimp_layer_resize (GimpLayer *layer,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -461,13 +420,9 @@ gimp_layer_resize (GimpLayer *layer,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-resize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-resize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-resize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -491,7 +446,6 @@ gimp_layer_resize (GimpLayer *layer,
gboolean
gimp_layer_resize_to_image_size (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -500,13 +454,9 @@ gimp_layer_resize_to_image_size (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-resize-to-image-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-resize-to-image-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-resize-to-image-size",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -535,7 +485,6 @@ gimp_layer_set_offsets (GimpLayer *layer,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -546,13 +495,9 @@ gimp_layer_set_offsets (GimpLayer *layer,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-offsets",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-offsets",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-offsets",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -596,7 +541,6 @@ GimpLayerMask *
gimp_layer_create_mask (GimpLayer *layer,
GimpAddMaskType mask_type)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerMask *mask = NULL;
@@ -606,13 +550,9 @@ gimp_layer_create_mask (GimpLayer *layer,
GIMP_TYPE_ADD_MASK_TYPE, mask_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-create-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-create-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-create-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -637,7 +577,6 @@ gimp_layer_create_mask (GimpLayer *layer,
GimpLayerMask *
gimp_layer_get_mask (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerMask *mask = NULL;
@@ -646,13 +585,9 @@ gimp_layer_get_mask (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -679,7 +614,6 @@ gimp_layer_get_mask (GimpLayer *layer)
GimpLayer *
gimp_layer_from_mask (GimpLayerMask *mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -688,13 +622,9 @@ gimp_layer_from_mask (GimpLayerMask *mask)
GIMP_TYPE_LAYER_MASK, mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-from-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-from-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-from-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -726,7 +656,6 @@ gboolean
gimp_layer_add_mask (GimpLayer *layer,
GimpLayerMask *mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -736,13 +665,9 @@ gimp_layer_add_mask (GimpLayer *layer,
GIMP_TYPE_LAYER_MASK, mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-add-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-add-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-add-mask",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -768,7 +693,6 @@ gboolean
gimp_layer_remove_mask (GimpLayer *layer,
GimpMaskApplyMode mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -778,13 +702,9 @@ gimp_layer_remove_mask (GimpLayer *layer,
GIMP_TYPE_MASK_APPLY_MODE, mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-remove-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-remove-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-remove-mask",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -809,7 +729,6 @@ gimp_layer_remove_mask (GimpLayer *layer,
gboolean
gimp_layer_is_floating_sel (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean is_floating_sel = FALSE;
@@ -818,13 +737,9 @@ gimp_layer_is_floating_sel (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-is-floating-sel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-is-floating-sel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-is-floating-sel",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -849,7 +764,6 @@ gimp_layer_is_floating_sel (GimpLayer *layer)
gboolean
gimp_layer_get_lock_alpha (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean lock_alpha = FALSE;
@@ -858,13 +772,9 @@ gimp_layer_get_lock_alpha (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-lock-alpha",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-lock-alpha",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-lock-alpha",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -891,7 +801,6 @@ gboolean
gimp_layer_set_lock_alpha (GimpLayer *layer,
gboolean lock_alpha)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -901,13 +810,9 @@ gimp_layer_set_lock_alpha (GimpLayer *layer,
G_TYPE_BOOLEAN, lock_alpha,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-lock-alpha",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-lock-alpha",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-lock-alpha",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -932,7 +837,6 @@ gimp_layer_set_lock_alpha (GimpLayer *layer,
gboolean
gimp_layer_get_apply_mask (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean apply_mask = FALSE;
@@ -941,13 +845,9 @@ gimp_layer_get_apply_mask (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-apply-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-apply-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-apply-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -976,7 +876,6 @@ gboolean
gimp_layer_set_apply_mask (GimpLayer *layer,
gboolean apply_mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -986,13 +885,9 @@ gimp_layer_set_apply_mask (GimpLayer *layer,
G_TYPE_BOOLEAN, apply_mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-apply-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-apply-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-apply-mask",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1018,7 +913,6 @@ gimp_layer_set_apply_mask (GimpLayer *layer,
gboolean
gimp_layer_get_show_mask (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean show_mask = FALSE;
@@ -1027,13 +921,9 @@ gimp_layer_get_show_mask (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-show-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-show-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-show-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1062,7 +952,6 @@ gboolean
gimp_layer_set_show_mask (GimpLayer *layer,
gboolean show_mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1072,13 +961,9 @@ gimp_layer_set_show_mask (GimpLayer *layer,
G_TYPE_BOOLEAN, show_mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-show-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-show-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-show-mask",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1103,7 +988,6 @@ gimp_layer_set_show_mask (GimpLayer *layer,
gboolean
gimp_layer_get_edit_mask (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean edit_mask = FALSE;
@@ -1112,13 +996,9 @@ gimp_layer_get_edit_mask (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-edit-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-edit-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-edit-mask",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1147,7 +1027,6 @@ gboolean
gimp_layer_set_edit_mask (GimpLayer *layer,
gboolean edit_mask)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1157,13 +1036,9 @@ gimp_layer_set_edit_mask (GimpLayer *layer,
G_TYPE_BOOLEAN, edit_mask,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-edit-mask",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-edit-mask",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-edit-mask",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1186,7 +1061,6 @@ gimp_layer_set_edit_mask (GimpLayer *layer,
gdouble
gimp_layer_get_opacity (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble opacity = 0.0;
@@ -1195,13 +1069,9 @@ gimp_layer_get_opacity (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-opacity",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1227,7 +1097,6 @@ gboolean
gimp_layer_set_opacity (GimpLayer *layer,
gdouble opacity)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1237,13 +1106,9 @@ gimp_layer_set_opacity (GimpLayer *layer,
G_TYPE_DOUBLE, opacity,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-opacity",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-opacity",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-opacity",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1266,7 +1131,6 @@ gimp_layer_set_opacity (GimpLayer *layer,
GimpLayerMode
gimp_layer_get_mode (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerMode mode = 0;
@@ -1275,13 +1139,9 @@ gimp_layer_get_mode (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-mode",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1307,7 +1167,6 @@ gboolean
gimp_layer_set_mode (GimpLayer *layer,
GimpLayerMode mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1317,13 +1176,9 @@ gimp_layer_set_mode (GimpLayer *layer,
GIMP_TYPE_LAYER_MODE, mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-mode",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1348,7 +1203,6 @@ gimp_layer_set_mode (GimpLayer *layer,
GimpLayerColorSpace
gimp_layer_get_blend_space (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerColorSpace blend_space = 0;
@@ -1357,13 +1211,9 @@ gimp_layer_get_blend_space (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-blend-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-blend-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-blend-space",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1391,7 +1241,6 @@ gboolean
gimp_layer_set_blend_space (GimpLayer *layer,
GimpLayerColorSpace blend_space)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1401,13 +1250,9 @@ gimp_layer_set_blend_space (GimpLayer *layer,
GIMP_TYPE_LAYER_COLOR_SPACE, blend_space,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-blend-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-blend-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-blend-space",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1432,7 +1277,6 @@ gimp_layer_set_blend_space (GimpLayer *layer,
GimpLayerColorSpace
gimp_layer_get_composite_space (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerColorSpace composite_space = 0;
@@ -1441,13 +1285,9 @@ gimp_layer_get_composite_space (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-composite-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-composite-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-composite-space",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1475,7 +1315,6 @@ gboolean
gimp_layer_set_composite_space (GimpLayer *layer,
GimpLayerColorSpace composite_space)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1485,13 +1324,9 @@ gimp_layer_set_composite_space (GimpLayer *layer,
GIMP_TYPE_LAYER_COLOR_SPACE, composite_space,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-composite-space",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-composite-space",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-composite-space",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1516,7 +1351,6 @@ gimp_layer_set_composite_space (GimpLayer *layer,
GimpLayerCompositeMode
gimp_layer_get_composite_mode (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayerCompositeMode composite_mode = 0;
@@ -1525,13 +1359,9 @@ gimp_layer_get_composite_mode (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-get-composite-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-get-composite-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-get-composite-mode",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1559,7 +1389,6 @@ gboolean
gimp_layer_set_composite_mode (GimpLayer *layer,
GimpLayerCompositeMode composite_mode)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1569,13 +1398,9 @@ gimp_layer_set_composite_mode (GimpLayer *layer,
GIMP_TYPE_LAYER_COMPOSITE_MODE, composite_mode,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-layer-set-composite-mode",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-layer-set-composite-mode",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-layer-set-composite-mode",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpmessage_pdb.c b/libgimp/gimpmessage_pdb.c
index cef7671ef1..2a44d46190 100644
--- a/libgimp/gimpmessage_pdb.c
+++ b/libgimp/gimpmessage_pdb.c
@@ -48,7 +48,6 @@
gboolean
gimp_message (const gchar *message)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -57,13 +56,9 @@ gimp_message (const gchar *message)
G_TYPE_STRING, message,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-message",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-message",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-message",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -87,7 +82,6 @@ gimp_message (const gchar *message)
GimpMessageHandlerType
gimp_message_get_handler (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpMessageHandlerType handler = 0;
@@ -95,13 +89,9 @@ gimp_message_get_handler (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-message-get-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-message-get-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-message-get-handler",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -127,7 +117,6 @@ gimp_message_get_handler (void)
gboolean
gimp_message_set_handler (GimpMessageHandlerType handler)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -136,13 +125,9 @@ gimp_message_set_handler (GimpMessageHandlerType handler)
GIMP_TYPE_MESSAGE_HANDLER_TYPE, handler,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-message-set-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-message-set-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-message-set-handler",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimppainttools_pdb.c b/libgimp/gimppainttools_pdb.c
index 6813882b42..7be929d8ab 100644
--- a/libgimp/gimppainttools_pdb.c
+++ b/libgimp/gimppainttools_pdb.c
@@ -57,7 +57,6 @@ gimp_airbrush (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -70,13 +69,9 @@ gimp_airbrush (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-airbrush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-airbrush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-airbrush",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -107,7 +102,6 @@ gimp_airbrush_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -119,13 +113,9 @@ gimp_airbrush_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-airbrush-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-airbrush-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-airbrush-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -171,7 +161,6 @@ gimp_clone (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -187,13 +176,9 @@ gimp_clone (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 6), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-clone",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-clone",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-clone",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -225,7 +210,6 @@ gimp_clone_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -237,13 +221,9 @@ gimp_clone_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-clone-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-clone-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-clone-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -277,7 +257,6 @@ gimp_convolve (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -291,13 +270,9 @@ gimp_convolve (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 4), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-convolve",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-convolve",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-convolve",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -328,7 +303,6 @@ gimp_convolve_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -340,13 +314,9 @@ gimp_convolve_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-convolve-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-convolve-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-convolve-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -379,7 +349,6 @@ gimp_dodgeburn (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -394,13 +363,9 @@ gimp_dodgeburn (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 5), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-dodgeburn",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-dodgeburn",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-dodgeburn",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -430,7 +395,6 @@ gimp_dodgeburn_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -442,13 +406,9 @@ gimp_dodgeburn_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-dodgeburn-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-dodgeburn-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-dodgeburn-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -483,7 +443,6 @@ gimp_eraser (GimpDrawable *drawable,
GimpBrushApplicationMode hardness,
GimpPaintApplicationMode method)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -497,13 +456,9 @@ gimp_eraser (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-eraser",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-eraser",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-eraser",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -534,7 +489,6 @@ gimp_eraser_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -546,13 +500,9 @@ gimp_eraser_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-eraser-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-eraser-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-eraser-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -592,7 +542,6 @@ gimp_heal (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -607,13 +556,9 @@ gimp_heal (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 5), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-heal",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-heal",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-heal",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -647,7 +592,6 @@ gimp_heal_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -659,13 +603,9 @@ gimp_heal_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-heal-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-heal-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-heal-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -707,7 +647,6 @@ gimp_paintbrush (GimpDrawable *drawable,
GimpPaintApplicationMode method,
gdouble gradient_length)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -722,13 +661,9 @@ gimp_paintbrush (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-paintbrush",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-paintbrush",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-paintbrush",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -768,7 +703,6 @@ gimp_paintbrush_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -780,13 +714,9 @@ gimp_paintbrush_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-paintbrush-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-paintbrush-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-paintbrush-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -818,7 +748,6 @@ gimp_pencil (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -830,13 +759,9 @@ gimp_pencil (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pencil",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pencil",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pencil",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -867,7 +792,6 @@ gimp_smudge (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -880,13 +804,9 @@ gimp_smudge (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-smudge",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-smudge",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-smudge",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -916,7 +836,6 @@ gimp_smudge_default (GimpDrawable *drawable,
gint num_strokes,
const gdouble *strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -928,13 +847,9 @@ gimp_smudge_default (GimpDrawable *drawable,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 2), strokes, num_strokes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-smudge-default",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-smudge-default",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-smudge-default",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimppalette_pdb.c b/libgimp/gimppalette_pdb.c
index c1ea29be0d..1a477f39ea 100644
--- a/libgimp/gimppalette_pdb.c
+++ b/libgimp/gimppalette_pdb.c
@@ -50,7 +50,6 @@
gchar *
gimp_palette_new (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -59,13 +58,9 @@ gimp_palette_new (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -92,7 +87,6 @@ gimp_palette_new (const gchar *name)
gchar *
gimp_palette_duplicate (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *copy_name = NULL;
@@ -101,13 +95,9 @@ gimp_palette_duplicate (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-duplicate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-duplicate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-duplicate",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -136,7 +126,6 @@ gchar *
gimp_palette_rename (const gchar *name,
const gchar *new_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *actual_name = NULL;
@@ -146,13 +135,9 @@ gimp_palette_rename (const gchar *name,
G_TYPE_STRING, new_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-rename",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-rename",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-rename",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -178,7 +163,6 @@ gimp_palette_rename (const gchar *name,
gboolean
gimp_palette_delete (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -187,13 +171,9 @@ gimp_palette_delete (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-delete",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-delete",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-delete",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -218,7 +198,6 @@ gimp_palette_delete (const gchar *name)
gboolean
gimp_palette_is_editable (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean editable = FALSE;
@@ -227,13 +206,9 @@ gimp_palette_is_editable (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-is-editable",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-is-editable",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-is-editable",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -262,7 +237,6 @@ gboolean
gimp_palette_get_info (const gchar *name,
gint *num_colors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -271,13 +245,9 @@ gimp_palette_get_info (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-get-info",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-get-info",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-get-info",
+ args);
gimp_value_array_unref (args);
*num_colors = 0;
@@ -311,7 +281,6 @@ GimpRGB *
gimp_palette_get_colors (const gchar *name,
gint *num_colors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpRGB *colors = NULL;
@@ -320,13 +289,9 @@ gimp_palette_get_colors (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-get-colors",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-get-colors",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-get-colors",
+ args);
gimp_value_array_unref (args);
*num_colors = 0;
@@ -358,7 +323,6 @@ gimp_palette_get_colors (const gchar *name,
gint
gimp_palette_get_columns (const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint num_columns = 0;
@@ -367,13 +331,9 @@ gimp_palette_get_columns (const gchar *name)
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-get-columns",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-get-columns",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-get-columns",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -403,7 +363,6 @@ gboolean
gimp_palette_set_columns (const gchar *name,
gint columns)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -413,13 +372,9 @@ gimp_palette_set_columns (const gchar *name,
G_TYPE_INT, columns,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-set-columns",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-set-columns",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-set-columns",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -451,7 +406,6 @@ gimp_palette_add_entry (const gchar *name,
const GimpRGB *color,
gint *entry_num)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -462,13 +416,9 @@ gimp_palette_add_entry (const gchar *name,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-add-entry",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-add-entry",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-add-entry",
+ args);
gimp_value_array_unref (args);
*entry_num = 0;
@@ -501,7 +451,6 @@ gboolean
gimp_palette_delete_entry (const gchar *name,
gint entry_num)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -511,13 +460,9 @@ gimp_palette_delete_entry (const gchar *name,
G_TYPE_INT, entry_num,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-delete-entry",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-delete-entry",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-delete-entry",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -548,7 +493,6 @@ gimp_palette_entry_get_color (const gchar *name,
gint entry_num,
GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -558,13 +502,9 @@ gimp_palette_entry_get_color (const gchar *name,
G_TYPE_INT, entry_num,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-entry-get-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-entry-get-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-entry-get-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -598,7 +538,6 @@ gimp_palette_entry_set_color (const gchar *name,
gint entry_num,
const GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -609,13 +548,9 @@ gimp_palette_entry_set_color (const gchar *name,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-entry-set-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-entry-set-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-entry-set-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -646,7 +581,6 @@ gimp_palette_entry_get_name (const gchar *name,
gint entry_num,
gchar **entry_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -656,13 +590,9 @@ gimp_palette_entry_get_name (const gchar *name,
G_TYPE_INT, entry_num,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-entry-get-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-entry-get-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-entry-get-name",
+ args);
gimp_value_array_unref (args);
*entry_name = NULL;
@@ -698,7 +628,6 @@ gimp_palette_entry_set_name (const gchar *name,
gint entry_num,
const gchar *entry_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -709,13 +638,9 @@ gimp_palette_entry_set_name (const gchar *name,
G_TYPE_STRING, entry_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palette-entry-set-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palette-entry-set-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palette-entry-set-name",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimppalettes_pdb.c b/libgimp/gimppalettes_pdb.c
index 8614931b99..3310dd7ccb 100644
--- a/libgimp/gimppalettes_pdb.c
+++ b/libgimp/gimppalettes_pdb.c
@@ -47,7 +47,6 @@
gboolean
gimp_palettes_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -55,13 +54,9 @@ gimp_palettes_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palettes-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palettes-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palettes-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gchar **
gimp_palettes_get_list (const gchar *filter,
gint *num_palettes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **palette_list = NULL;
@@ -99,13 +93,9 @@ gimp_palettes_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palettes-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palettes-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palettes-get-list",
+ args);
gimp_value_array_unref (args);
*num_palettes = 0;
diff --git a/libgimp/gimppaletteselect_pdb.c b/libgimp/gimppaletteselect_pdb.c
index c7ac81c8ca..e84ff5ff88 100644
--- a/libgimp/gimppaletteselect_pdb.c
+++ b/libgimp/gimppaletteselect_pdb.c
@@ -51,7 +51,6 @@ gimp_palettes_popup (const gchar *palette_callback,
const gchar *popup_title,
const gchar *initial_palette)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -62,13 +61,9 @@ gimp_palettes_popup (const gchar *palette_callback,
G_TYPE_STRING, initial_palette,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palettes-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palettes-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palettes-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -91,7 +86,6 @@ gimp_palettes_popup (const gchar *palette_callback,
gboolean
gimp_palettes_close_popup (const gchar *palette_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -100,13 +94,9 @@ gimp_palettes_close_popup (const gchar *palette_callback)
G_TYPE_STRING, palette_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palettes-close-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palettes-close-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palettes-close-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -131,7 +121,6 @@ gboolean
gimp_palettes_set_popup (const gchar *palette_callback,
const gchar *palette_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -141,13 +130,9 @@ gimp_palettes_set_popup (const gchar *palette_callback,
G_TYPE_STRING, palette_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-palettes-set-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-palettes-set-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-palettes-set-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimppattern_pdb.c b/libgimp/gimppattern_pdb.c
index 56f22e7208..c2cd494c96 100644
--- a/libgimp/gimppattern_pdb.c
+++ b/libgimp/gimppattern_pdb.c
@@ -56,7 +56,6 @@ gimp_pattern_get_info (const gchar *name,
gint *height,
gint *bpp)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -65,13 +64,9 @@ gimp_pattern_get_info (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pattern-get-info",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pattern-get-info",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pattern-get-info",
+ args);
gimp_value_array_unref (args);
*width = 0;
@@ -119,7 +114,6 @@ gimp_pattern_get_pixels (const gchar *name,
gint *num_color_bytes,
guint8 **color_bytes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -128,13 +122,9 @@ gimp_pattern_get_pixels (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pattern-get-pixels",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pattern-get-pixels",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pattern-get-pixels",
+ args);
gimp_value_array_unref (args);
*width = 0;
diff --git a/libgimp/gimppatterns_pdb.c b/libgimp/gimppatterns_pdb.c
index b061297ecf..49145f2ee1 100644
--- a/libgimp/gimppatterns_pdb.c
+++ b/libgimp/gimppatterns_pdb.c
@@ -47,7 +47,6 @@
gboolean
gimp_patterns_refresh (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -55,13 +54,9 @@ gimp_patterns_refresh (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-patterns-refresh",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-patterns-refresh",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-patterns-refresh",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ gchar **
gimp_patterns_get_list (const gchar *filter,
gint *num_patterns)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar **pattern_list = NULL;
@@ -99,13 +93,9 @@ gimp_patterns_get_list (const gchar *filter,
G_TYPE_STRING, filter,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-patterns-get-list",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-patterns-get-list",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-patterns-get-list",
+ args);
gimp_value_array_unref (args);
*num_patterns = 0;
diff --git a/libgimp/gimppatternselect_pdb.c b/libgimp/gimppatternselect_pdb.c
index 6c2d4529fc..00a44f4147 100644
--- a/libgimp/gimppatternselect_pdb.c
+++ b/libgimp/gimppatternselect_pdb.c
@@ -51,7 +51,6 @@ gimp_patterns_popup (const gchar *pattern_callback,
const gchar *popup_title,
const gchar *initial_pattern)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -62,13 +61,9 @@ gimp_patterns_popup (const gchar *pattern_callback,
G_TYPE_STRING, initial_pattern,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-patterns-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-patterns-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-patterns-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -91,7 +86,6 @@ gimp_patterns_popup (const gchar *pattern_callback,
gboolean
gimp_patterns_close_popup (const gchar *pattern_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -100,13 +94,9 @@ gimp_patterns_close_popup (const gchar *pattern_callback)
G_TYPE_STRING, pattern_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-patterns-close-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-patterns-close-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-patterns-close-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -131,7 +121,6 @@ gboolean
gimp_patterns_set_popup (const gchar *pattern_callback,
const gchar *pattern_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -141,13 +130,9 @@ gimp_patterns_set_popup (const gchar *pattern_callback,
G_TYPE_STRING, pattern_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-patterns-set-popup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-patterns-set-popup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-patterns-set-popup",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimppdb_pdb.c b/libgimp/gimppdb_pdb.c
index 3e3dbe0df4..bd3a42e49e 100644
--- a/libgimp/gimppdb_pdb.c
+++ b/libgimp/gimppdb_pdb.c
@@ -39,7 +39,6 @@
gchar *
_gimp_pdb_temp_name (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *temp_name = NULL;
@@ -47,13 +46,9 @@ _gimp_pdb_temp_name (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-temp-name",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-temp-name",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-temp-name",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -79,7 +74,6 @@ _gimp_pdb_temp_name (void)
gboolean
_gimp_pdb_dump (const gchar *filename)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -88,13 +82,9 @@ _gimp_pdb_dump (const gchar *filename)
G_TYPE_STRING, filename,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-dump",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-dump",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-dump",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -145,7 +135,6 @@ _gimp_pdb_query (const gchar *name,
gint *num_matches,
gchar ***procedure_names)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -160,13 +149,9 @@ _gimp_pdb_query (const gchar *name,
G_TYPE_STRING, proc_type,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-query",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-query",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-query",
+ args);
gimp_value_array_unref (args);
*num_matches = 0;
@@ -201,7 +186,6 @@ _gimp_pdb_query (const gchar *name,
gboolean
_gimp_pdb_proc_exists (const gchar *procedure_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean exists = FALSE;
@@ -210,13 +194,9 @@ _gimp_pdb_proc_exists (const gchar *procedure_name)
G_TYPE_STRING, procedure_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-proc-exists",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-proc-exists",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-proc-exists",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -262,7 +242,6 @@ _gimp_pdb_proc_info (const gchar *procedure_name,
gint *num_args,
gint *num_values)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -271,13 +250,9 @@ _gimp_pdb_proc_info (const gchar *procedure_name,
G_TYPE_STRING, procedure_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-proc-info",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-proc-info",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-proc-info",
+ args);
gimp_value_array_unref (args);
*blurb = NULL;
@@ -327,7 +302,6 @@ GParamSpec *
_gimp_pdb_proc_argument (const gchar *procedure_name,
gint arg_num)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GParamSpec *param_spec = NULL;
@@ -337,13 +311,9 @@ _gimp_pdb_proc_argument (const gchar *procedure_name,
G_TYPE_INT, arg_num,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-proc-argument",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-proc-argument",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-proc-argument",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -374,7 +344,6 @@ GParamSpec *
_gimp_pdb_proc_return_value (const gchar *procedure_name,
gint val_num)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GParamSpec *param_spec = NULL;
@@ -384,13 +353,9 @@ _gimp_pdb_proc_return_value (const gchar *procedure_name,
G_TYPE_INT, val_num,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-proc-return-value",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-proc-return-value",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-proc-return-value",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -421,7 +386,6 @@ _gimp_pdb_get_data (const gchar *identifier,
gint *bytes,
guint8 **data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -430,13 +394,9 @@ _gimp_pdb_get_data (const gchar *identifier,
G_TYPE_STRING, identifier,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-get-data",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-get-data",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-get-data",
+ args);
gimp_value_array_unref (args);
*bytes = 0;
@@ -470,7 +430,6 @@ _gimp_pdb_get_data (const gchar *identifier,
gint
_gimp_pdb_get_data_size (const gchar *identifier)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint bytes = 0;
@@ -479,13 +438,9 @@ _gimp_pdb_get_data_size (const gchar *identifier)
G_TYPE_STRING, identifier,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-get-data-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-get-data-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-get-data-size",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -515,7 +470,6 @@ _gimp_pdb_set_data (const gchar *identifier,
gint bytes,
const guint8 *data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -527,13 +481,9 @@ _gimp_pdb_set_data (const gchar *identifier,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 2), data, bytes);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-pdb-set-data",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-pdb-set-data",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-pdb-set-data",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpplugin_pdb.c b/libgimp/gimpplugin_pdb.c
index c40f7713b9..dce363f3d6 100644
--- a/libgimp/gimpplugin_pdb.c
+++ b/libgimp/gimpplugin_pdb.c
@@ -47,7 +47,6 @@ gboolean
_gimp_plugin_domain_register (const gchar *domain_name,
const gchar *domain_path)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -57,13 +56,9 @@ _gimp_plugin_domain_register (const gchar *domain_name,
G_TYPE_STRING, domain_path,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-domain-register",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-domain-register",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-domain-register",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -92,7 +87,6 @@ gboolean
_gimp_plugin_help_register (const gchar *domain_name,
const gchar *domain_uri)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -102,13 +96,9 @@ _gimp_plugin_help_register (const gchar *domain_name,
G_TYPE_STRING, domain_uri,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-help-register",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-help-register",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-help-register",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -138,7 +128,6 @@ gboolean
_gimp_plugin_menu_branch_register (const gchar *menu_path,
const gchar *menu_name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -148,13 +137,9 @@ _gimp_plugin_menu_branch_register (const gchar *menu_path,
G_TYPE_STRING, menu_name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-menu-branch-register",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-menu-branch-register",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-menu-branch-register",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -182,7 +167,6 @@ gboolean
_gimp_plugin_menu_register (const gchar *procedure_name,
const gchar *menu_path)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -192,13 +176,9 @@ _gimp_plugin_menu_register (const gchar *procedure_name,
G_TYPE_STRING, menu_path,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-menu-register",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-menu-register",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-menu-register",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -229,7 +209,6 @@ _gimp_plugin_icon_register (const gchar *procedure_name,
gint icon_data_length,
const guint8 *icon_data)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -242,13 +221,9 @@ _gimp_plugin_icon_register (const gchar *procedure_name,
G_TYPE_NONE);
gimp_value_set_uint8_array (gimp_value_array_index (args, 3), icon_data, icon_data_length);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-icon-register",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-icon-register",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-icon-register",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -280,7 +255,6 @@ _gimp_plugin_icon_register (const gchar *procedure_name,
gboolean
_gimp_plugin_set_pdb_error_handler (GimpPDBErrorHandler handler)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -289,13 +263,9 @@ _gimp_plugin_set_pdb_error_handler (GimpPDBErrorHandler handler)
GIMP_TYPE_PDB_ERROR_HANDLER, handler,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-set-pdb-error-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-set-pdb-error-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-set-pdb-error-handler",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -321,7 +291,6 @@ _gimp_plugin_set_pdb_error_handler (GimpPDBErrorHandler handler)
GimpPDBErrorHandler
_gimp_plugin_get_pdb_error_handler (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpPDBErrorHandler handler = 0;
@@ -329,13 +298,9 @@ _gimp_plugin_get_pdb_error_handler (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-plugin-get-pdb-error-handler",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-plugin-get-pdb-error-handler",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-plugin-get-pdb-error-handler",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpprocedure-private.h b/libgimp/gimpprocedure-private.h
index 2c1e148e84..9dc4e0f4c1 100644
--- a/libgimp/gimpprocedure-private.h
+++ b/libgimp/gimpprocedure-private.h
@@ -28,8 +28,6 @@
G_BEGIN_DECLS
-/* For information look into the C source or the html documentation */
-
GimpDisplay * _gimp_procedure_get_display (GimpProcedure *procedure,
gint32 display_id);
diff --git a/libgimp/gimpprogress_pdb.c b/libgimp/gimpprogress_pdb.c
index 4280ed9c01..37d751678e 100644
--- a/libgimp/gimpprogress_pdb.c
+++ b/libgimp/gimpprogress_pdb.c
@@ -50,7 +50,6 @@ gboolean
_gimp_progress_init (const gchar *message,
GimpDisplay *gdisplay)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -60,13 +59,9 @@ _gimp_progress_init (const gchar *message,
GIMP_TYPE_DISPLAY, gdisplay,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-init",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-init",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-init",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -90,7 +85,6 @@ _gimp_progress_init (const gchar *message,
gboolean
_gimp_progress_update (gdouble percentage)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -99,13 +93,9 @@ _gimp_progress_update (gdouble percentage)
G_TYPE_DOUBLE, percentage,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-update",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-update",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-update",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -133,7 +123,6 @@ _gimp_progress_update (gdouble percentage)
gboolean
gimp_progress_pulse (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -141,13 +130,9 @@ gimp_progress_pulse (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-pulse",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-pulse",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-pulse",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -174,7 +159,6 @@ gimp_progress_pulse (void)
gboolean
gimp_progress_set_text (const gchar *message)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -183,13 +167,9 @@ gimp_progress_set_text (const gchar *message)
G_TYPE_STRING, message,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-set-text",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-set-text",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-set-text",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -215,7 +195,6 @@ gimp_progress_set_text (const gchar *message)
gboolean
gimp_progress_end (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -223,13 +202,9 @@ gimp_progress_end (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-end",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-end",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-end",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -255,7 +230,6 @@ gimp_progress_end (void)
gint
gimp_progress_get_window_handle (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint window = 0;
@@ -263,13 +237,9 @@ gimp_progress_get_window_handle (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-get-window-handle",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-get-window-handle",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-get-window-handle",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -298,7 +268,6 @@ gimp_progress_get_window_handle (void)
gboolean
_gimp_progress_install (const gchar *progress_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -307,13 +276,9 @@ _gimp_progress_install (const gchar *progress_callback)
G_TYPE_STRING, progress_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-install",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-install",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-install",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -339,7 +304,6 @@ _gimp_progress_install (const gchar *progress_callback)
gboolean
_gimp_progress_uninstall (const gchar *progress_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -348,13 +312,9 @@ _gimp_progress_uninstall (const gchar *progress_callback)
G_TYPE_STRING, progress_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-uninstall",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-uninstall",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-uninstall",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -379,7 +339,6 @@ _gimp_progress_uninstall (const gchar *progress_callback)
gboolean
gimp_progress_cancel (const gchar *progress_callback)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -388,13 +347,9 @@ gimp_progress_cancel (const gchar *progress_callback)
G_TYPE_STRING, progress_callback,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-progress-cancel",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-progress-cancel",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-progress-cancel",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimpselection_pdb.c b/libgimp/gimpselection_pdb.c
index 48a5d127f1..9ed6f9f107 100644
--- a/libgimp/gimpselection_pdb.c
+++ b/libgimp/gimpselection_pdb.c
@@ -64,7 +64,6 @@ gimp_selection_bounds (GimpImage *image,
gint *x2,
gint *y2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -73,13 +72,9 @@ gimp_selection_bounds (GimpImage *image,
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-bounds",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-bounds",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-bounds",
+ args);
gimp_value_array_unref (args);
*non_empty = FALSE;
@@ -122,7 +117,6 @@ gimp_selection_value (GimpImage *image,
gint x,
gint y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint value = 0;
@@ -133,13 +127,9 @@ gimp_selection_value (GimpImage *image,
G_TYPE_INT, y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-value",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-value",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-value",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -164,7 +154,6 @@ gimp_selection_value (GimpImage *image,
gboolean
gimp_selection_is_empty (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean is_empty = FALSE;
@@ -173,13 +162,9 @@ gimp_selection_is_empty (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-is-empty",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-is-empty",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-is-empty",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -211,7 +196,6 @@ gimp_selection_translate (GimpImage *image,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -222,13 +206,9 @@ gimp_selection_translate (GimpImage *image,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-translate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-translate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-translate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -260,7 +240,6 @@ _gimp_selection_float (GimpDrawable *drawable,
gint offx,
gint offy)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -271,13 +250,9 @@ _gimp_selection_float (GimpDrawable *drawable,
G_TYPE_INT, offy,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-float",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-float",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-float",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -302,7 +277,6 @@ _gimp_selection_float (GimpDrawable *drawable,
gboolean
gimp_selection_invert (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -311,13 +285,9 @@ gimp_selection_invert (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-invert",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-invert",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-invert",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -343,7 +313,6 @@ gimp_selection_invert (GimpImage *image)
gboolean
gimp_selection_sharpen (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -352,13 +321,9 @@ gimp_selection_sharpen (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-sharpen",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-sharpen",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-sharpen",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -382,7 +347,6 @@ gimp_selection_sharpen (GimpImage *image)
gboolean
gimp_selection_all (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -391,13 +355,9 @@ gimp_selection_all (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-all",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-all",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-all",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -421,7 +381,6 @@ gimp_selection_all (GimpImage *image)
gboolean
gimp_selection_none (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -430,13 +389,9 @@ gimp_selection_none (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-none",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-none",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-none",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -462,7 +417,6 @@ gboolean
gimp_selection_feather (GimpImage *image,
gdouble radius)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -472,13 +426,9 @@ gimp_selection_feather (GimpImage *image,
G_TYPE_DOUBLE, radius,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-feather",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-feather",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-feather",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -505,7 +455,6 @@ gboolean
gimp_selection_border (GimpImage *image,
gint radius)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -515,13 +464,9 @@ gimp_selection_border (GimpImage *image,
G_TYPE_INT, radius,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-border",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-border",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-border",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -547,7 +492,6 @@ gboolean
gimp_selection_grow (GimpImage *image,
gint steps)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -557,13 +501,9 @@ gimp_selection_grow (GimpImage *image,
G_TYPE_INT, steps,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-grow",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-grow",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-grow",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -590,7 +530,6 @@ gboolean
gimp_selection_shrink (GimpImage *image,
gint steps)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -600,13 +539,9 @@ gimp_selection_shrink (GimpImage *image,
G_TYPE_INT, steps,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-shrink",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-shrink",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-shrink",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -634,7 +569,6 @@ gimp_selection_shrink (GimpImage *image,
gboolean
gimp_selection_flood (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -643,13 +577,9 @@ gimp_selection_flood (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-flood",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-flood",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-flood",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -674,7 +604,6 @@ gimp_selection_flood (GimpImage *image)
GimpChannel *
gimp_selection_save (GimpImage *image)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpChannel *channel = NULL;
@@ -683,13 +612,9 @@ gimp_selection_save (GimpImage *image)
GIMP_TYPE_IMAGE, image,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-selection-save",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-selection-save",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-selection-save",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimptextlayer_pdb.c b/libgimp/gimptextlayer_pdb.c
index a73718fd70..d387abee94 100644
--- a/libgimp/gimptextlayer_pdb.c
+++ b/libgimp/gimptextlayer_pdb.c
@@ -62,7 +62,6 @@ gimp_text_layer_new (GimpImage *image,
gdouble size,
GimpUnit unit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *layer = NULL;
@@ -75,13 +74,9 @@ gimp_text_layer_new (GimpImage *image,
GIMP_TYPE_UNIT, unit,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -108,7 +103,6 @@ gimp_text_layer_new (GimpImage *image,
gchar *
gimp_text_layer_get_text (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *text = NULL;
@@ -117,13 +111,9 @@ gimp_text_layer_get_text (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-text",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-text",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-text",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -151,7 +141,6 @@ gboolean
gimp_text_layer_set_text (GimpLayer *layer,
const gchar *text)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -161,13 +150,9 @@ gimp_text_layer_set_text (GimpLayer *layer,
G_TYPE_STRING, text,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-text",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-text",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-text",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -198,7 +183,6 @@ gimp_text_layer_set_text (GimpLayer *layer,
gchar *
gimp_text_layer_get_markup (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *markup = NULL;
@@ -207,13 +191,9 @@ gimp_text_layer_get_markup (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-markup",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-markup",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-markup",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -241,7 +221,6 @@ gimp_text_layer_get_markup (GimpLayer *layer)
gchar *
gimp_text_layer_get_font (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *font = NULL;
@@ -250,13 +229,9 @@ gimp_text_layer_get_font (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-font",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-font",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-font",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -284,7 +259,6 @@ gboolean
gimp_text_layer_set_font (GimpLayer *layer,
const gchar *font)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -294,13 +268,9 @@ gimp_text_layer_set_font (GimpLayer *layer,
G_TYPE_STRING, font,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-font",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-font",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-font",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -329,7 +299,6 @@ gdouble
gimp_text_layer_get_font_size (GimpLayer *layer,
GimpUnit *unit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble font_size = 0.0;
@@ -338,13 +307,9 @@ gimp_text_layer_get_font_size (GimpLayer *layer,
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-font-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-font-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-font-size",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -378,7 +343,6 @@ gimp_text_layer_set_font_size (GimpLayer *layer,
gdouble font_size,
GimpUnit unit)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -389,13 +353,9 @@ gimp_text_layer_set_font_size (GimpLayer *layer,
GIMP_TYPE_UNIT, unit,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-font-size",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-font-size",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-font-size",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -421,7 +381,6 @@ gimp_text_layer_set_font_size (GimpLayer *layer,
gboolean
gimp_text_layer_get_antialias (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean antialias = FALSE;
@@ -430,13 +389,9 @@ gimp_text_layer_get_antialias (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-antialias",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-antialias",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-antialias",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -465,7 +420,6 @@ gboolean
gimp_text_layer_set_antialias (GimpLayer *layer,
gboolean antialias)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -475,13 +429,9 @@ gimp_text_layer_set_antialias (GimpLayer *layer,
G_TYPE_BOOLEAN, antialias,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-antialias",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-antialias",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-antialias",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -508,7 +458,6 @@ gimp_text_layer_set_antialias (GimpLayer *layer,
GimpTextHintStyle
gimp_text_layer_get_hint_style (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpTextHintStyle style = 0;
@@ -517,13 +466,9 @@ gimp_text_layer_get_hint_style (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-hint-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-hint-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-hint-style",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -553,7 +498,6 @@ gboolean
gimp_text_layer_set_hint_style (GimpLayer *layer,
GimpTextHintStyle style)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -563,13 +507,9 @@ gimp_text_layer_set_hint_style (GimpLayer *layer,
GIMP_TYPE_TEXT_HINT_STYLE, style,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-hint-style",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-hint-style",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-hint-style",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -595,7 +535,6 @@ gimp_text_layer_set_hint_style (GimpLayer *layer,
gboolean
gimp_text_layer_get_kerning (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean kerning = FALSE;
@@ -604,13 +543,9 @@ gimp_text_layer_get_kerning (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-kerning",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-kerning",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-kerning",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -638,7 +573,6 @@ gboolean
gimp_text_layer_set_kerning (GimpLayer *layer,
gboolean kerning)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -648,13 +582,9 @@ gimp_text_layer_set_kerning (GimpLayer *layer,
G_TYPE_BOOLEAN, kerning,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-kerning",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-kerning",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-kerning",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -681,7 +611,6 @@ gimp_text_layer_set_kerning (GimpLayer *layer,
gchar *
gimp_text_layer_get_language (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *language = NULL;
@@ -690,13 +619,9 @@ gimp_text_layer_get_language (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-language",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-language",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-language",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -725,7 +650,6 @@ gboolean
gimp_text_layer_set_language (GimpLayer *layer,
const gchar *language)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -735,13 +659,9 @@ gimp_text_layer_set_language (GimpLayer *layer,
G_TYPE_STRING, language,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-language",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-language",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-language",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -767,7 +687,6 @@ gimp_text_layer_set_language (GimpLayer *layer,
GimpTextDirection
gimp_text_layer_get_base_direction (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpTextDirection direction = 0;
@@ -776,13 +695,9 @@ gimp_text_layer_get_base_direction (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-base-direction",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-base-direction",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-base-direction",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -811,7 +726,6 @@ gboolean
gimp_text_layer_set_base_direction (GimpLayer *layer,
GimpTextDirection direction)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -821,13 +735,9 @@ gimp_text_layer_set_base_direction (GimpLayer *layer,
GIMP_TYPE_TEXT_DIRECTION, direction,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-base-direction",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-base-direction",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-base-direction",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -853,7 +763,6 @@ gimp_text_layer_set_base_direction (GimpLayer *layer,
GimpTextJustification
gimp_text_layer_get_justification (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpTextJustification justify = 0;
@@ -862,13 +771,9 @@ gimp_text_layer_get_justification (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-justification",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-justification",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-justification",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -897,7 +802,6 @@ gboolean
gimp_text_layer_set_justification (GimpLayer *layer,
GimpTextJustification justify)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -907,13 +811,9 @@ gimp_text_layer_set_justification (GimpLayer *layer,
GIMP_TYPE_TEXT_JUSTIFICATION, justify,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-justification",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-justification",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-justification",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -940,7 +840,6 @@ gboolean
gimp_text_layer_get_color (GimpLayer *layer,
GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -949,13 +848,9 @@ gimp_text_layer_get_color (GimpLayer *layer,
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -985,7 +880,6 @@ gboolean
gimp_text_layer_set_color (GimpLayer *layer,
const GimpRGB *color)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -995,13 +889,9 @@ gimp_text_layer_set_color (GimpLayer *layer,
GIMP_TYPE_RGB, color,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-color",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-color",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-color",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1027,7 +917,6 @@ gimp_text_layer_set_color (GimpLayer *layer,
gdouble
gimp_text_layer_get_indent (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble indent = 0.0;
@@ -1036,13 +925,9 @@ gimp_text_layer_get_indent (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-indent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-indent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-indent",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1071,7 +956,6 @@ gboolean
gimp_text_layer_set_indent (GimpLayer *layer,
gdouble indent)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1081,13 +965,9 @@ gimp_text_layer_set_indent (GimpLayer *layer,
G_TYPE_DOUBLE, indent,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-indent",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-indent",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-indent",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1113,7 +993,6 @@ gimp_text_layer_set_indent (GimpLayer *layer,
gdouble
gimp_text_layer_get_line_spacing (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble line_spacing = 0.0;
@@ -1122,13 +1001,9 @@ gimp_text_layer_get_line_spacing (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-line-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-line-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-line-spacing",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1157,7 +1032,6 @@ gboolean
gimp_text_layer_set_line_spacing (GimpLayer *layer,
gdouble line_spacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1167,13 +1041,9 @@ gimp_text_layer_set_line_spacing (GimpLayer *layer,
G_TYPE_DOUBLE, line_spacing,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-line-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-line-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-line-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1199,7 +1069,6 @@ gimp_text_layer_set_line_spacing (GimpLayer *layer,
gdouble
gimp_text_layer_get_letter_spacing (GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble letter_spacing = 0.0;
@@ -1208,13 +1077,9 @@ gimp_text_layer_get_letter_spacing (GimpLayer *layer)
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-get-letter-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-get-letter-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-get-letter-spacing",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1243,7 +1108,6 @@ gboolean
gimp_text_layer_set_letter_spacing (GimpLayer *layer,
gdouble letter_spacing)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1253,13 +1117,9 @@ gimp_text_layer_set_letter_spacing (GimpLayer *layer,
G_TYPE_DOUBLE, letter_spacing,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-set-letter-spacing",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-set-letter-spacing",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-set-letter-spacing",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1290,7 +1150,6 @@ gimp_text_layer_resize (GimpLayer *layer,
gdouble width,
gdouble height)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1301,13 +1160,9 @@ gimp_text_layer_resize (GimpLayer *layer,
G_TYPE_DOUBLE, height,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-layer-resize",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-layer-resize",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-layer-resize",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
diff --git a/libgimp/gimptexttool_pdb.c b/libgimp/gimptexttool_pdb.c
index 3b7e3cf8af..ba65ab36b7 100644
--- a/libgimp/gimptexttool_pdb.c
+++ b/libgimp/gimptexttool_pdb.c
@@ -79,7 +79,6 @@ gimp_text_fontname (GimpImage *image,
GimpSizeType size_type,
const gchar *fontname)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpLayer *text_layer = NULL;
@@ -97,13 +96,9 @@ gimp_text_fontname (GimpImage *image,
G_TYPE_STRING, fontname,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-fontname",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-fontname",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-fontname",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -147,7 +142,6 @@ gimp_text_get_extents_fontname (const gchar *text,
gint *ascent,
gint *descent)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -159,13 +153,9 @@ gimp_text_get_extents_fontname (const gchar *text,
G_TYPE_STRING, fontname,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-text-get-extents-fontname",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-text-get-extents-fontname",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-text-get-extents-fontname",
+ args);
gimp_value_array_unref (args);
*width = 0;
diff --git a/libgimp/gimptilebackendplugin.c b/libgimp/gimptilebackendplugin.c
index efbe77d657..8a77a8f67b 100644
--- a/libgimp/gimptilebackendplugin.c
+++ b/libgimp/gimptilebackendplugin.c
@@ -30,7 +30,6 @@
#include "libgimpbase/gimpwire.h"
#include "gimp-shm.h"
-#include "gimplegacy-private.h"
#include "gimpplugin-private.h"
#include "gimptilebackendplugin.h"
@@ -97,9 +96,6 @@ G_DEFINE_TYPE_WITH_PRIVATE (GimpTileBackendPlugin, _gimp_tile_backend_plugin,
#define parent_class _gimp_tile_backend_plugin_parent_class
-extern GIOChannel *_gimp_readchannel;
-extern GIOChannel *_gimp_writechannel;
-
static GMutex backend_plugin_mutex;
@@ -351,22 +347,11 @@ gimp_tile_get (GimpTileBackendPlugin *backend_plugin,
tile_req.tile_num = tile->tile_num;
tile_req.shadow = priv->shadow;
+ if (! gp_tile_req_write (_gimp_plug_in_get_write_channel (plug_in),
+ &tile_req, plug_in))
+ gimp_quit ();
- if (plug_in)
- {
- if (! gp_tile_req_write (_gimp_plug_in_get_write_channel (plug_in),
- &tile_req, plug_in))
- gimp_quit ();
-
- _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_DATA);
- }
- else
- {
- if (! gp_tile_req_write (_gimp_writechannel, &tile_req, NULL))
- gimp_quit ();
-
- _gimp_legacy_read_expect_msg (&msg, GP_TILE_DATA);
- }
+ _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_DATA);
tile_data = msg.data;
if (tile_data->drawable_id != priv->drawable_id ||
@@ -407,17 +392,9 @@ gimp_tile_get (GimpTileBackendPlugin *backend_plugin,
tile_data->data = NULL;
}
- if (plug_in)
- {
- if (! gp_tile_ack_write (_gimp_plug_in_get_write_channel (plug_in),
- plug_in))
- gimp_quit ();
- }
- else
- {
- if (! gp_tile_ack_write (_gimp_writechannel, NULL))
- gimp_quit ();
- }
+ if (! gp_tile_ack_write (_gimp_plug_in_get_write_channel (plug_in),
+ plug_in))
+ gimp_quit ();
gimp_wire_destroy (&msg);
}
@@ -437,21 +414,11 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
tile_req.tile_num = 0;
tile_req.shadow = 0;
- if (plug_in)
- {
- if (! gp_tile_req_write (_gimp_plug_in_get_write_channel (plug_in),
- &tile_req, plug_in))
- gimp_quit ();
-
- _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_DATA);
- }
- else
- {
- if (! gp_tile_req_write (_gimp_writechannel, &tile_req, NULL))
- gimp_quit ();
+ if (! gp_tile_req_write (_gimp_plug_in_get_write_channel (plug_in),
+ &tile_req, plug_in))
+ gimp_quit ();
- _gimp_legacy_read_expect_msg (&msg, GP_TILE_DATA);
- }
+ _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_DATA);
tile_info = msg.data;
@@ -475,27 +442,16 @@ gimp_tile_put (GimpTileBackendPlugin *backend_plugin,
tile_data.data = tile->data;
}
- if (plug_in)
- {
- if (! gp_tile_data_write (_gimp_plug_in_get_write_channel (plug_in),
- &tile_data, plug_in))
- gimp_quit ();
- }
- else
- {
- if (! gp_tile_data_write (_gimp_writechannel, &tile_data, NULL))
- gimp_quit ();
- }
+ if (! gp_tile_data_write (_gimp_plug_in_get_write_channel (plug_in),
+ &tile_data, plug_in))
+ gimp_quit ();
if (! tile_info->use_shm)
tile_data.data = NULL;
gimp_wire_destroy (&msg);
- if (plug_in)
- _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_ACK);
- else
- _gimp_legacy_read_expect_msg (&msg, GP_TILE_ACK);
+ _gimp_plug_in_read_expect_msg (plug_in, &msg, GP_TILE_ACK);
gimp_wire_destroy (&msg);
}
diff --git a/libgimp/gimptypes.h b/libgimp/gimptypes.h
index 03ce8dab47..cb9c34aa00 100644
--- a/libgimp/gimptypes.h
+++ b/libgimp/gimptypes.h
@@ -32,11 +32,6 @@ typedef struct _GimpPDB GimpPDB;
typedef struct _GimpPlugIn GimpPlugIn;
typedef struct _GimpProcedure GimpProcedure;
-typedef struct _GimpPlugInInfo GimpPlugInInfo;
-typedef struct _GimpParamDef GimpParamDef;
-typedef union _GimpParamData GimpParamData;
-typedef struct _GimpParam GimpParam;
-
typedef struct _GimpImage GimpImage;
typedef struct _GimpItem GimpItem;
typedef struct _GimpDrawable GimpDrawable;
diff --git a/libgimp/gimpunit_pdb.c b/libgimp/gimpunit_pdb.c
index 42fd992322..46195ba6c2 100644
--- a/libgimp/gimpunit_pdb.c
+++ b/libgimp/gimpunit_pdb.c
@@ -37,7 +37,6 @@
gint
_gimp_unit_get_number_of_units (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint num_units = GIMP_UNIT_END;
@@ -45,13 +44,9 @@ _gimp_unit_get_number_of_units (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-number-of-units",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-number-of-units",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-number-of-units",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -74,7 +69,6 @@ _gimp_unit_get_number_of_units (void)
gint
_gimp_unit_get_number_of_built_in_units (void)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint num_units = GIMP_UNIT_END;
@@ -82,13 +76,9 @@ _gimp_unit_get_number_of_built_in_units (void)
args = gimp_value_array_new_from_types (NULL,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-number-of-built-in-units",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-number-of-built-in-units",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-number-of-built-in-units",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -127,7 +117,6 @@ _gimp_unit_new (const gchar *identifier,
const gchar *singular,
const gchar *plural)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpUnit unit_id = GIMP_UNIT_INCH;
@@ -142,13 +131,9 @@ _gimp_unit_new (const gchar *identifier,
G_TYPE_STRING, plural,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -174,7 +159,6 @@ _gimp_unit_new (const gchar *identifier,
gboolean
_gimp_unit_get_deletion_flag (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean deletion_flag = FALSE;
@@ -183,13 +167,9 @@ _gimp_unit_get_deletion_flag (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-deletion-flag",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-deletion-flag",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-deletion-flag",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -217,7 +197,6 @@ gboolean
_gimp_unit_set_deletion_flag (GimpUnit unit_id,
gboolean deletion_flag)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -227,13 +206,9 @@ _gimp_unit_set_deletion_flag (GimpUnit unit_id,
G_TYPE_BOOLEAN, deletion_flag,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-set-deletion-flag",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-set-deletion-flag",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-set-deletion-flag",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -259,7 +234,6 @@ _gimp_unit_set_deletion_flag (GimpUnit unit_id,
gchar *
_gimp_unit_get_identifier (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *identifier = NULL;
@@ -268,13 +242,9 @@ _gimp_unit_get_identifier (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-identifier",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-identifier",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-identifier",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -300,7 +270,6 @@ _gimp_unit_get_identifier (GimpUnit unit_id)
gdouble
_gimp_unit_get_factor (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble factor = 0.0;
@@ -309,13 +278,9 @@ _gimp_unit_get_factor (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-factor",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-factor",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-factor",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -342,7 +307,6 @@ _gimp_unit_get_factor (GimpUnit unit_id)
gint
_gimp_unit_get_digits (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint digits = 0;
@@ -351,13 +315,9 @@ _gimp_unit_get_digits (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-digits",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-digits",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-digits",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -382,7 +342,6 @@ _gimp_unit_get_digits (GimpUnit unit_id)
gchar *
_gimp_unit_get_symbol (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *symbol = NULL;
@@ -391,13 +350,9 @@ _gimp_unit_get_symbol (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-symbol",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-symbol",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-symbol",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -423,7 +378,6 @@ _gimp_unit_get_symbol (GimpUnit unit_id)
gchar *
_gimp_unit_get_abbreviation (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *abbreviation = NULL;
@@ -432,13 +386,9 @@ _gimp_unit_get_abbreviation (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-abbreviation",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-abbreviation",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-abbreviation",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -463,7 +413,6 @@ _gimp_unit_get_abbreviation (GimpUnit unit_id)
gchar *
_gimp_unit_get_singular (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *singular = NULL;
@@ -472,13 +421,9 @@ _gimp_unit_get_singular (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-singular",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-singular",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-singular",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -503,7 +448,6 @@ _gimp_unit_get_singular (GimpUnit unit_id)
gchar *
_gimp_unit_get_plural (GimpUnit unit_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *plural = NULL;
@@ -512,13 +456,9 @@ _gimp_unit_get_plural (GimpUnit unit_id)
GIMP_TYPE_UNIT, unit_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-unit-get-plural",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-unit-get-plural",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-unit-get-plural",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimp/gimpvectors_pdb.c b/libgimp/gimpvectors_pdb.c
index 4c24ae173c..db2576cc49 100644
--- a/libgimp/gimpvectors_pdb.c
+++ b/libgimp/gimpvectors_pdb.c
@@ -53,7 +53,6 @@ GimpVectors *
gimp_vectors_new (GimpImage *image,
const gchar *name)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *vectors = NULL;
@@ -63,13 +62,9 @@ gimp_vectors_new (GimpImage *image,
G_TYPE_STRING, name,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-new",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-new",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-new",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -98,7 +93,6 @@ GimpVectors *
gimp_vectors_new_from_text_layer (GimpImage *image,
GimpLayer *layer)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *vectors = NULL;
@@ -108,13 +102,9 @@ gimp_vectors_new_from_text_layer (GimpImage *image,
GIMP_TYPE_LAYER, layer,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-new-from-text-layer",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-new-from-text-layer",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-new-from-text-layer",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -141,7 +131,6 @@ gimp_vectors_new_from_text_layer (GimpImage *image,
GimpVectors *
gimp_vectors_copy (GimpVectors *vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectors *vectors_copy = NULL;
@@ -150,13 +139,9 @@ gimp_vectors_copy (GimpVectors *vectors)
GIMP_TYPE_VECTORS, vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-copy",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-copy",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-copy",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -187,7 +172,6 @@ gint *
gimp_vectors_get_strokes (GimpVectors *vectors,
gint *num_strokes)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint *stroke_ids = NULL;
@@ -196,13 +180,9 @@ gimp_vectors_get_strokes (GimpVectors *vectors,
GIMP_TYPE_VECTORS, vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-get-strokes",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-get-strokes",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-get-strokes",
+ args);
gimp_value_array_unref (args);
*num_strokes = 0;
@@ -237,7 +217,6 @@ gimp_vectors_stroke_get_length (GimpVectors *vectors,
gint stroke_id,
gdouble precision)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble length = 0.0;
@@ -248,13 +227,9 @@ gimp_vectors_stroke_get_length (GimpVectors *vectors,
G_TYPE_DOUBLE, precision,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-get-length",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-get-length",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-get-length",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -299,7 +274,6 @@ gimp_vectors_stroke_get_point_at_dist (GimpVectors *vectors,
gdouble *slope,
gboolean *valid)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -311,13 +285,9 @@ gimp_vectors_stroke_get_point_at_dist (GimpVectors *vectors,
G_TYPE_DOUBLE, precision,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-get-point-at-dist",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-get-point-at-dist",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-get-point-at-dist",
+ args);
gimp_value_array_unref (args);
*x_point = 0.0;
@@ -357,7 +327,6 @@ gboolean
gimp_vectors_remove_stroke (GimpVectors *vectors,
gint stroke_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -367,13 +336,9 @@ gimp_vectors_remove_stroke (GimpVectors *vectors,
G_TYPE_INT, stroke_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-remove-stroke",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-remove-stroke",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-remove-stroke",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -400,7 +365,6 @@ gboolean
gimp_vectors_stroke_close (GimpVectors *vectors,
gint stroke_id)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -410,13 +374,9 @@ gimp_vectors_stroke_close (GimpVectors *vectors,
G_TYPE_INT, stroke_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-close",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-close",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-close",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -447,7 +407,6 @@ gimp_vectors_stroke_translate (GimpVectors *vectors,
gint off_x,
gint off_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -459,13 +418,9 @@ gimp_vectors_stroke_translate (GimpVectors *vectors,
G_TYPE_INT, off_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-translate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-translate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-translate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -496,7 +451,6 @@ gimp_vectors_stroke_scale (GimpVectors *vectors,
gdouble scale_x,
gdouble scale_y)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -508,13 +462,9 @@ gimp_vectors_stroke_scale (GimpVectors *vectors,
G_TYPE_DOUBLE, scale_y,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-scale",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-scale",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-scale",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -547,7 +497,6 @@ gimp_vectors_stroke_rotate (GimpVectors *vectors,
gdouble center_y,
gdouble angle)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -560,13 +509,9 @@ gimp_vectors_stroke_rotate (GimpVectors *vectors,
G_TYPE_DOUBLE, angle,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-rotate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-rotate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-rotate",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -597,7 +542,6 @@ gimp_vectors_stroke_flip (GimpVectors *vectors,
GimpOrientationType flip_type,
gdouble axis)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -609,13 +553,9 @@ gimp_vectors_stroke_flip (GimpVectors *vectors,
G_TYPE_DOUBLE, axis,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-flip",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-flip",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-flip",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -652,7 +592,6 @@ gimp_vectors_stroke_flip_free (GimpVectors *vectors,
gdouble x2,
gdouble y2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -666,13 +605,9 @@ gimp_vectors_stroke_flip_free (GimpVectors *vectors,
G_TYPE_DOUBLE, y2,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-flip-free",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-flip-free",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-flip-free",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -708,7 +643,6 @@ gimp_vectors_stroke_get_points (GimpVectors *vectors,
gdouble **controlpoints,
gboolean *closed)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
GimpVectorsStrokeType type = 0;
@@ -718,13 +652,9 @@ gimp_vectors_stroke_get_points (GimpVectors *vectors,
G_TYPE_INT, stroke_id,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-get-points",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-get-points",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-get-points",
+ args);
gimp_value_array_unref (args);
*num_points = 0;
@@ -772,7 +702,6 @@ gimp_vectors_stroke_new_from_points (GimpVectors *vectors,
const gdouble *controlpoints,
gboolean closed)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint stroke_id = 0;
@@ -786,13 +715,9 @@ gimp_vectors_stroke_new_from_points (GimpVectors *vectors,
G_TYPE_NONE);
gimp_value_set_float_array (gimp_value_array_index (args, 3), controlpoints, num_points);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-new-from-points",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-new-from-points",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-new-from-points",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -828,7 +753,6 @@ gimp_vectors_stroke_interpolate (GimpVectors *vectors,
gint *num_coords,
gboolean *closed)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gdouble *coords = NULL;
@@ -839,13 +763,9 @@ gimp_vectors_stroke_interpolate (GimpVectors *vectors,
G_TYPE_DOUBLE, precision,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-stroke-interpolate",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-stroke-interpolate",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-stroke-interpolate",
+ args);
gimp_value_array_unref (args);
*num_coords = 0;
@@ -881,7 +801,6 @@ gimp_vectors_bezier_stroke_new_moveto (GimpVectors *vectors,
gdouble x0,
gdouble y0)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint stroke_id = 0;
@@ -892,13 +811,9 @@ gimp_vectors_bezier_stroke_new_moveto (GimpVectors *vectors,
G_TYPE_DOUBLE, y0,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-bezier-stroke-new-moveto",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-bezier-stroke-new-moveto",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-bezier-stroke-new-moveto",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -930,7 +845,6 @@ gimp_vectors_bezier_stroke_lineto (GimpVectors *vectors,
gdouble x0,
gdouble y0)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -942,13 +856,9 @@ gimp_vectors_bezier_stroke_lineto (GimpVectors *vectors,
G_TYPE_DOUBLE, y0,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-bezier-stroke-lineto",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-bezier-stroke-lineto",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-bezier-stroke-lineto",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -985,7 +895,6 @@ gimp_vectors_bezier_stroke_conicto (GimpVectors *vectors,
gdouble x1,
gdouble y1)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -999,13 +908,9 @@ gimp_vectors_bezier_stroke_conicto (GimpVectors *vectors,
G_TYPE_DOUBLE, y1,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-bezier-stroke-conicto",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-bezier-stroke-conicto",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-bezier-stroke-conicto",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1044,7 +949,6 @@ gimp_vectors_bezier_stroke_cubicto (GimpVectors *vectors,
gdouble x2,
gdouble y2)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1060,13 +964,9 @@ gimp_vectors_bezier_stroke_cubicto (GimpVectors *vectors,
G_TYPE_DOUBLE, y2,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-bezier-stroke-cubicto",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-bezier-stroke-cubicto",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-bezier-stroke-cubicto",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1101,7 +1001,6 @@ gimp_vectors_bezier_stroke_new_ellipse (GimpVectors *vectors,
gdouble radius_y,
gdouble angle)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gint stroke_id = 0;
@@ -1115,13 +1014,9 @@ gimp_vectors_bezier_stroke_new_ellipse (GimpVectors *vectors,
G_TYPE_DOUBLE, angle,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-bezier-stroke-new-ellipse",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-bezier-stroke-new-ellipse",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-bezier-stroke-new-ellipse",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
@@ -1158,7 +1053,6 @@ gimp_vectors_import_from_file (GimpImage *image,
gint *num_vectors,
gint **vectors_ids)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1170,13 +1064,9 @@ gimp_vectors_import_from_file (GimpImage *image,
G_TYPE_BOOLEAN, scale,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-import-from-file",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-import-from-file",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-import-from-file",
+ args);
gimp_value_array_unref (args);
*num_vectors = 0;
@@ -1224,7 +1114,6 @@ gimp_vectors_import_from_string (GimpImage *image,
gint *num_vectors,
gint **vectors_ids)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1237,13 +1126,9 @@ gimp_vectors_import_from_string (GimpImage *image,
G_TYPE_BOOLEAN, scale,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-import-from-string",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-import-from-string",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-import-from-string",
+ args);
gimp_value_array_unref (args);
*num_vectors = 0;
@@ -1284,7 +1169,6 @@ gimp_vectors_export_to_file (GimpImage *image,
const gchar *filename,
GimpVectors *vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gboolean success = TRUE;
@@ -1295,13 +1179,9 @@ gimp_vectors_export_to_file (GimpImage *image,
GIMP_TYPE_VECTORS, vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-export-to-file",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-export-to-file",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-export-to-file",
+ args);
gimp_value_array_unref (args);
success = g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS;
@@ -1333,7 +1213,6 @@ gchar *
gimp_vectors_export_to_string (GimpImage *image,
GimpVectors *vectors)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;
gchar *string = NULL;
@@ -1343,13 +1222,9 @@ gimp_vectors_export_to_string (GimpImage *image,
GIMP_TYPE_VECTORS, vectors,
G_TYPE_NONE);
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-vectors-export-to-string",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-vectors-export-to-string",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-vectors-export-to-string",
+ args);
gimp_value_array_unref (args);
if (g_value_get_enum (gimp_value_array_index (return_vals, 0)) == GIMP_PDB_SUCCESS)
diff --git a/libgimpbase/gimpbase.def b/libgimpbase/gimpbase.def
index 9f3ef2a3ea..021c2e19f9 100644
--- a/libgimpbase/gimpbase.def
+++ b/libgimpbase/gimpbase.def
@@ -143,7 +143,6 @@ EXPORTS
gimp_path_get_user_writable_dir
gimp_path_parse
gimp_path_to_str
- gimp_pdb_arg_type_get_type
gimp_pdb_error_handler_get_type
gimp_pdb_proc_type_get_type
gimp_pdb_status_type_get_type
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index d8e394843b..abbbe48ca4 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -1238,78 +1238,6 @@ gimp_paint_application_mode_get_type (void)
return type;
}
-GType
-gimp_pdb_arg_type_get_type (void)
-{
- static const GEnumValue values[] =
- {
- { GIMP_PDB_INT32, "GIMP_PDB_INT32", "int32" },
- { GIMP_PDB_INT16, "GIMP_PDB_INT16", "int16" },
- { GIMP_PDB_INT8, "GIMP_PDB_INT8", "int8" },
- { GIMP_PDB_FLOAT, "GIMP_PDB_FLOAT", "float" },
- { GIMP_PDB_STRING, "GIMP_PDB_STRING", "string" },
- { GIMP_PDB_INT32ARRAY, "GIMP_PDB_INT32ARRAY", "int32array" },
- { GIMP_PDB_INT16ARRAY, "GIMP_PDB_INT16ARRAY", "int16array" },
- { GIMP_PDB_INT8ARRAY, "GIMP_PDB_INT8ARRAY", "int8array" },
- { GIMP_PDB_FLOATARRAY, "GIMP_PDB_FLOATARRAY", "floatarray" },
- { GIMP_PDB_STRINGARRAY, "GIMP_PDB_STRINGARRAY", "stringarray" },
- { GIMP_PDB_COLOR, "GIMP_PDB_COLOR", "color" },
- { GIMP_PDB_ITEM, "GIMP_PDB_ITEM", "item" },
- { GIMP_PDB_DISPLAY, "GIMP_PDB_DISPLAY", "display" },
- { GIMP_PDB_IMAGE, "GIMP_PDB_IMAGE", "image" },
- { GIMP_PDB_LAYER, "GIMP_PDB_LAYER", "layer" },
- { GIMP_PDB_CHANNEL, "GIMP_PDB_CHANNEL", "channel" },
- { GIMP_PDB_DRAWABLE, "GIMP_PDB_DRAWABLE", "drawable" },
- { GIMP_PDB_SELECTION, "GIMP_PDB_SELECTION", "selection" },
- { GIMP_PDB_COLORARRAY, "GIMP_PDB_COLORARRAY", "colorarray" },
- { GIMP_PDB_VECTORS, "GIMP_PDB_VECTORS", "vectors" },
- { GIMP_PDB_PARASITE, "GIMP_PDB_PARASITE", "parasite" },
- { GIMP_PDB_STATUS, "GIMP_PDB_STATUS", "status" },
- { GIMP_PDB_END, "GIMP_PDB_END", "end" },
- { 0, NULL, NULL }
- };
-
- static const GimpEnumDesc descs[] =
- {
- { GIMP_PDB_INT32, "GIMP_PDB_INT32", NULL },
- { GIMP_PDB_INT16, "GIMP_PDB_INT16", NULL },
- { GIMP_PDB_INT8, "GIMP_PDB_INT8", NULL },
- { GIMP_PDB_FLOAT, "GIMP_PDB_FLOAT", NULL },
- { GIMP_PDB_STRING, "GIMP_PDB_STRING", NULL },
- { GIMP_PDB_INT32ARRAY, "GIMP_PDB_INT32ARRAY", NULL },
- { GIMP_PDB_INT16ARRAY, "GIMP_PDB_INT16ARRAY", NULL },
- { GIMP_PDB_INT8ARRAY, "GIMP_PDB_INT8ARRAY", NULL },
- { GIMP_PDB_FLOATARRAY, "GIMP_PDB_FLOATARRAY", NULL },
- { GIMP_PDB_STRINGARRAY, "GIMP_PDB_STRINGARRAY", NULL },
- { GIMP_PDB_COLOR, "GIMP_PDB_COLOR", NULL },
- { GIMP_PDB_ITEM, "GIMP_PDB_ITEM", NULL },
- { GIMP_PDB_DISPLAY, "GIMP_PDB_DISPLAY", NULL },
- { GIMP_PDB_IMAGE, "GIMP_PDB_IMAGE", NULL },
- { GIMP_PDB_LAYER, "GIMP_PDB_LAYER", NULL },
- { GIMP_PDB_CHANNEL, "GIMP_PDB_CHANNEL", NULL },
- { GIMP_PDB_DRAWABLE, "GIMP_PDB_DRAWABLE", NULL },
- { GIMP_PDB_SELECTION, "GIMP_PDB_SELECTION", NULL },
- { GIMP_PDB_COLORARRAY, "GIMP_PDB_COLORARRAY", NULL },
- { GIMP_PDB_VECTORS, "GIMP_PDB_VECTORS", NULL },
- { GIMP_PDB_PARASITE, "GIMP_PDB_PARASITE", NULL },
- { GIMP_PDB_STATUS, "GIMP_PDB_STATUS", NULL },
- { GIMP_PDB_END, "GIMP_PDB_END", NULL },
- { 0, NULL, NULL }
- };
-
- static GType type = 0;
-
- if (G_UNLIKELY (! type))
- {
- type = g_enum_register_static ("GimpPDBArgType", values);
- gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
- gimp_type_set_translation_context (type, "pdb-arg-type");
- gimp_enum_set_value_descriptions (type, descs);
- }
-
- return type;
-}
-
GType
gimp_pdb_error_handler_get_type (void)
{
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index 64240e69a9..feefa52f32 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -828,66 +828,6 @@ typedef enum
} GimpPaintApplicationMode;
-/**
- * GimpPDBArgType:
- * @GIMP_PDB_INT32: 32-bit integer
- * @GIMP_PDB_INT16: 16-bit integer
- * @GIMP_PDB_INT8: 8-bit integer
- * @GIMP_PDB_FLOAT: Float
- * @GIMP_PDB_STRING: String
- * @GIMP_PDB_INT32ARRAY: Array of INT32
- * @GIMP_PDB_INT16ARRAY: Array of INT16
- * @GIMP_PDB_INT8ARRAY: Array of INT8
- * @GIMP_PDB_FLOATARRAY: Array of floats
- * @GIMP_PDB_STRINGARRAY: Array of strings
- * @GIMP_PDB_COLOR: Color
- * @GIMP_PDB_ITEM: Item ID
- * @GIMP_PDB_DISPLAY: Display ID
- * @GIMP_PDB_IMAGE: Image ID
- * @GIMP_PDB_LAYER: Layer ID
- * @GIMP_PDB_CHANNEL: Channel ID
- * @GIMP_PDB_DRAWABLE: Drawable ID
- * @GIMP_PDB_SELECTION: Selection ID
- * @GIMP_PDB_COLORARRAY: Array of colors
- * @GIMP_PDB_VECTORS: Vectors (psath) ID
- * @GIMP_PDB_PARASITE: Parasite
- * @GIMP_PDB_STATUS: Procedure return status
- * @GIMP_PDB_END: Marker for last enum value
- *
- * Parameter types of the PDB.
- **/
-#define GIMP_TYPE_PDB_ARG_TYPE (gimp_pdb_arg_type_get_type ())
-
-GType gimp_pdb_arg_type_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
- GIMP_PDB_INT32,
- GIMP_PDB_INT16,
- GIMP_PDB_INT8,
- GIMP_PDB_FLOAT,
- GIMP_PDB_STRING,
- GIMP_PDB_INT32ARRAY,
- GIMP_PDB_INT16ARRAY,
- GIMP_PDB_INT8ARRAY,
- GIMP_PDB_FLOATARRAY,
- GIMP_PDB_STRINGARRAY,
- GIMP_PDB_COLOR,
- GIMP_PDB_ITEM,
- GIMP_PDB_DISPLAY,
- GIMP_PDB_IMAGE,
- GIMP_PDB_LAYER,
- GIMP_PDB_CHANNEL,
- GIMP_PDB_DRAWABLE,
- GIMP_PDB_SELECTION,
- GIMP_PDB_COLORARRAY,
- GIMP_PDB_VECTORS,
- GIMP_PDB_PARASITE,
- GIMP_PDB_STATUS,
- GIMP_PDB_END
-} GimpPDBArgType;
-
-
/**
* GimpPDBErrorHandler:
* @GIMP_PDB_ERROR_HANDLER_INTERNAL: Internal
diff --git a/pdb/enums.pl b/pdb/enums.pl
index c1d74d22f3..80ade64347 100644
--- a/pdb/enums.pl
+++ b/pdb/enums.pl
@@ -391,42 +391,6 @@ package Gimp::CodeGen::enums;
mapping => { GIMP_PAINT_CONSTANT => '0',
GIMP_PAINT_INCREMENTAL => '1' }
},
- GimpPDBArgType =>
- { contig => 1,
- header => 'libgimpbase/gimpbaseenums.h',
- symbols => [ qw(GIMP_PDB_INT32 GIMP_PDB_INT16 GIMP_PDB_INT8
- GIMP_PDB_FLOAT GIMP_PDB_STRING GIMP_PDB_INT32ARRAY
- GIMP_PDB_INT16ARRAY GIMP_PDB_INT8ARRAY
- GIMP_PDB_FLOATARRAY GIMP_PDB_STRINGARRAY
- GIMP_PDB_COLOR GIMP_PDB_ITEM GIMP_PDB_DISPLAY
- GIMP_PDB_IMAGE GIMP_PDB_LAYER GIMP_PDB_CHANNEL
- GIMP_PDB_DRAWABLE GIMP_PDB_SELECTION
- GIMP_PDB_COLORARRAY GIMP_PDB_VECTORS
- GIMP_PDB_PARASITE GIMP_PDB_STATUS GIMP_PDB_END) ],
- mapping => { GIMP_PDB_INT32 => '0',
- GIMP_PDB_INT16 => '1',
- GIMP_PDB_INT8 => '2',
- GIMP_PDB_FLOAT => '3',
- GIMP_PDB_STRING => '4',
- GIMP_PDB_INT32ARRAY => '5',
- GIMP_PDB_INT16ARRAY => '6',
- GIMP_PDB_INT8ARRAY => '7',
- GIMP_PDB_FLOATARRAY => '8',
- GIMP_PDB_STRINGARRAY => '9',
- GIMP_PDB_COLOR => '10',
- GIMP_PDB_ITEM => '11',
- GIMP_PDB_DISPLAY => '12',
- GIMP_PDB_IMAGE => '13',
- GIMP_PDB_LAYER => '14',
- GIMP_PDB_CHANNEL => '15',
- GIMP_PDB_DRAWABLE => '16',
- GIMP_PDB_SELECTION => '17',
- GIMP_PDB_COLORARRAY => '18',
- GIMP_PDB_VECTORS => '19',
- GIMP_PDB_PARASITE => '20',
- GIMP_PDB_STATUS => '21',
- GIMP_PDB_END => '22' }
- },
GimpPDBErrorHandler =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
diff --git a/pdb/lib.pl b/pdb/lib.pl
index cf06d93ad9..c468dce0f9 100644
--- a/pdb/lib.pl
+++ b/pdb/lib.pl
@@ -523,20 +523,15 @@ $retdesc$sincedesc
$rettype
$wrapped$funcname ($clist)
{
- GimpPDB *pdb = gimp_get_pdb ();
GimpValueArray *args;
GimpValueArray *return_vals;$return_args
args = gimp_value_array_new_from_types (NULL,
${value_array}G_TYPE_NONE);
$arg_array
- if (pdb)
- return_vals = gimp_pdb_run_procedure_array (pdb,
- "gimp-$proc->{canonical_name}",
- args);
- else
- return_vals = gimp_run_procedure_array ("gimp-$proc->{canonical_name}",
- args);
+ return_vals = gimp_pdb_run_procedure_array (gimp_get_pdb (),
+ "gimp-$proc->{canonical_name}",
+ args);
gimp_value_array_unref (args);
$return_marshal
diff --git a/po-libgimp/POTFILES.in b/po-libgimp/POTFILES.in
index 5036e24e7f..b2e752f4c1 100644
--- a/po-libgimp/POTFILES.in
+++ b/po-libgimp/POTFILES.in
@@ -9,7 +9,6 @@ libgimp/gimpexport.c
libgimp/gimpfontselectbutton.c
libgimp/gimpgradientselectbutton.c
libgimp/gimpimagemetadata.c
-libgimp/gimplegacy.c
libgimp/gimppaletteselectbutton.c
libgimp/gimppatternselectbutton.c
libgimp/gimppdb.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
