gimp r26593 - in trunk: . app/pdb app/plug-in app/xcf plug-ins/pygimp po tools/pdbgen tools/pdbgen/pdb
- From: neo svn gnome org
- To: svn-commits-list gnome org
- Subject: gimp r26593 - in trunk: . app/pdb app/plug-in app/xcf plug-ins/pygimp po tools/pdbgen tools/pdbgen/pdb
- Date: Sat, 16 Aug 2008 13:57:57 +0000 (UTC)
Author: neo
Date: Sat Aug 16 13:57:57 2008
New Revision: 26593
URL: http://svn.gnome.org/viewvc/gimp?rev=26593&view=rev
Log:
2008-08-16 Sven Neumann <sven gimp org>
If a procedure call fails, pass a string describing the error as
the second return value. First step towars fixing bug #344818.
* app/pdb/gimpprocedure.[ch] (gimp_procedure_get_return_values):
added a GError parameter. If it is set, pass the error message
to
the return values.
* app/pdb/gimppdberror.h: added some more error codes.
* app/pdb/gimppdb.c
* app/xcf/xcf.c: pass errors to
gimp_procedure_get_return_values().
* app/plug-in/gimpplugin-message.c
(gimp_plug_in_handle_proc_run):
show a different error message for execution vs. calling errors.
* app/plug-in/gimpplugin-progress.c
(gimp_plug_in_progress_cancel_callback): pass the error
GIMP_PDB_CANCELLED to gimp_procedure_get_return_values().
* app/plug-in/gimppluginmanager-call.[ch]
(gimp_plug_in_manager_call_run): removed the
'destroy_return_vals'
parameter.
* app/plug-in/gimppluginprocedure.c: destroy the return values
here.
* app/plug-in/gimppluginprocframe.c: pass an error to
gimp_procedure_get_return_values().
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/fileops.pdb: generate code that passes the
error to gimp_procedure_get_return_values().
* app/pdb/*-cmds.c: regenerated.
* plug-ins/pygimp/pygimp-pdb.c: extract the error message from
the
return values and pass it to the exception that is thrown.
Modified:
trunk/ChangeLog
trunk/app/pdb/brush-cmds.c
trunk/app/pdb/brush-select-cmds.c
trunk/app/pdb/brushes-cmds.c
trunk/app/pdb/buffer-cmds.c
trunk/app/pdb/channel-cmds.c
trunk/app/pdb/color-cmds.c
trunk/app/pdb/context-cmds.c
trunk/app/pdb/convert-cmds.c
trunk/app/pdb/display-cmds.c
trunk/app/pdb/drawable-cmds.c
trunk/app/pdb/drawable-transform-cmds.c
trunk/app/pdb/edit-cmds.c
trunk/app/pdb/fileops-cmds.c
trunk/app/pdb/floating-sel-cmds.c
trunk/app/pdb/font-select-cmds.c
trunk/app/pdb/fonts-cmds.c
trunk/app/pdb/gimppdb.c
trunk/app/pdb/gimppdberror.h
trunk/app/pdb/gimpprocedure.c
trunk/app/pdb/gimpprocedure.h
trunk/app/pdb/gimprc-cmds.c
trunk/app/pdb/gradient-cmds.c
trunk/app/pdb/gradient-select-cmds.c
trunk/app/pdb/gradients-cmds.c
trunk/app/pdb/grid-cmds.c
trunk/app/pdb/guides-cmds.c
trunk/app/pdb/help-cmds.c
trunk/app/pdb/image-cmds.c
trunk/app/pdb/layer-cmds.c
trunk/app/pdb/message-cmds.c
trunk/app/pdb/misc-cmds.c
trunk/app/pdb/paint-tools-cmds.c
trunk/app/pdb/palette-cmds.c
trunk/app/pdb/palette-select-cmds.c
trunk/app/pdb/palettes-cmds.c
trunk/app/pdb/parasite-cmds.c
trunk/app/pdb/paths-cmds.c
trunk/app/pdb/pattern-cmds.c
trunk/app/pdb/pattern-select-cmds.c
trunk/app/pdb/patterns-cmds.c
trunk/app/pdb/plug-in-cmds.c
trunk/app/pdb/procedural-db-cmds.c
trunk/app/pdb/progress-cmds.c
trunk/app/pdb/selection-cmds.c
trunk/app/pdb/selection-tools-cmds.c
trunk/app/pdb/text-layer-cmds.c
trunk/app/pdb/text-tool-cmds.c
trunk/app/pdb/transform-tools-cmds.c
trunk/app/pdb/undo-cmds.c
trunk/app/pdb/unit-cmds.c
trunk/app/pdb/vectors-cmds.c
trunk/app/plug-in/gimpplugin-message.c
trunk/app/plug-in/gimpplugin-progress.c
trunk/app/plug-in/gimppluginmanager-call.c
trunk/app/plug-in/gimppluginmanager-call.h
trunk/app/plug-in/gimppluginprocedure.c
trunk/app/plug-in/gimppluginprocframe.c
trunk/app/xcf/xcf.c
trunk/plug-ins/pygimp/pygimp-pdb.c
trunk/po/POTFILES.in
trunk/tools/pdbgen/app.pl
trunk/tools/pdbgen/pdb/fileops.pdb
Modified: trunk/app/pdb/brush-cmds.c
==============================================================================
--- trunk/app/pdb/brush-cmds.c (original)
+++ trunk/app/pdb/brush-cmds.c Sat Aug 16 13:57:57 2008
@@ -65,7 +65,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -107,7 +108,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], copy_name);
@@ -140,7 +142,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], generated);
@@ -178,7 +181,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -211,7 +215,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -239,7 +244,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], editable);
@@ -280,7 +286,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -341,7 +348,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -383,7 +391,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], spacing);
@@ -416,7 +425,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -444,7 +454,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], shape);
@@ -483,7 +494,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], shape_out);
@@ -516,7 +528,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], radius);
@@ -555,7 +568,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], radius_out);
@@ -588,7 +602,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], spikes);
@@ -627,7 +642,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], spikes_out);
@@ -660,7 +676,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], hardness);
@@ -699,7 +716,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], hardness_out);
@@ -732,7 +750,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], aspect_ratio);
@@ -771,7 +790,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], aspect_ratio_out);
@@ -804,7 +824,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], angle);
@@ -843,7 +864,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], angle_out);
Modified: trunk/app/pdb/brush-select-cmds.c
==============================================================================
--- trunk/app/pdb/brush-select-cmds.c (original)
+++ trunk/app/pdb/brush-select-cmds.c Sat Aug 16 13:57:57 2008
@@ -70,7 +70,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -95,7 +96,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -132,7 +134,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/brushes-cmds.c
==============================================================================
--- trunk/app/pdb/brushes-cmds.c (original)
+++ trunk/app/pdb/brushes-cmds.c Sat Aug 16 13:57:57 2008
@@ -50,7 +50,7 @@
{
gimp_data_factory_data_refresh (gimp->brush_factory);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -75,7 +75,8 @@
filter, &num_brushes);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -113,7 +114,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -145,7 +147,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], spacing);
@@ -171,7 +174,8 @@
gimp_brush_set_spacing (gimp_context_get_brush (context), spacing);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -220,7 +224,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/buffer-cmds.c
==============================================================================
--- trunk/app/pdb/buffer-cmds.c (original)
+++ trunk/app/pdb/buffer-cmds.c Sat Aug 16 13:57:57 2008
@@ -60,7 +60,8 @@
filter, &num_buffers);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -101,7 +102,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], real_name);
@@ -132,7 +134,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -160,7 +163,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], width);
@@ -193,7 +197,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], height);
@@ -226,7 +231,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], bytes);
@@ -259,7 +265,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], image_type);
Modified: trunk/app/pdb/channel-cmds.c
==============================================================================
--- trunk/app/pdb/channel-cmds.c (original)
+++ trunk/app/pdb/channel-cmds.c Sat Aug 16 13:57:57 2008
@@ -75,7 +75,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], channel);
@@ -114,7 +115,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], channel);
@@ -146,7 +148,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], channel_copy);
@@ -181,7 +184,8 @@
gimp_channel_combine_mask (channel1, channel2, operation, offx, offy);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -204,7 +208,8 @@
show_masked = gimp_channel_get_show_masked (channel);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], show_masked);
@@ -232,7 +237,8 @@
gimp_channel_set_show_masked (channel, show_masked);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -255,7 +261,8 @@
opacity = gimp_channel_get_opacity (channel) * 100;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], opacity);
@@ -283,7 +290,8 @@
gimp_channel_set_opacity (channel, opacity / 100.0, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -307,7 +315,8 @@
gimp_rgb_set_alpha (&color, 1.0);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &color);
@@ -338,7 +347,8 @@
gimp_channel_set_color (channel, &rgb_color, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/color-cmds.c
==============================================================================
--- trunk/app/pdb/color-cmds.c (original)
+++ trunk/app/pdb/color-cmds.c Sat Aug 16 13:57:57 2008
@@ -76,7 +76,8 @@
brightness, contrast);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -122,7 +123,8 @@
low_output, high_output);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -148,7 +150,8 @@
gimp_drawable_levels_stretch (drawable, progress);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -174,7 +177,8 @@
gimp_drawable_levels_stretch (drawable, progress);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -202,7 +206,8 @@
gimp_drawable_posterize (drawable, progress, levels);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -228,7 +233,8 @@
gimp_drawable_desaturate (drawable, progress, GIMP_DESATURATE_LIGHTNESS);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -256,7 +262,8 @@
gimp_drawable_desaturate (drawable, progress, desaturate_mode);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -284,7 +291,8 @@
gimp_drawable_equalize (drawable, mask_only);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -310,7 +318,8 @@
gimp_drawable_invert (drawable, progress);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -347,7 +356,8 @@
channel, control_pts, num_points);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -384,7 +394,8 @@
channel, curve, num_bytes);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -423,7 +434,8 @@
preserve_lum);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -456,7 +468,8 @@
hue, saturation, lightness);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -516,7 +529,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -563,7 +577,8 @@
hue_range, hue_offset, saturation, lightness);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -595,7 +610,8 @@
low_threshold, high_threshold);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/context-cmds.c
==============================================================================
--- trunk/app/pdb/context-cmds.c (original)
+++ trunk/app/pdb/context-cmds.c Sat Aug 16 13:57:57 2008
@@ -57,7 +57,8 @@
else
success = FALSE;
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -76,7 +77,8 @@
else
success = FALSE;
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -94,7 +96,7 @@
paint_methods = gimp_container_get_name_array (gimp->paint_info_list,
&num_paint_methods);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_paint_methods);
gimp_value_take_stringarray (&return_vals->values[2], paint_methods, num_paint_methods);
@@ -121,7 +123,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -152,7 +155,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -169,7 +173,7 @@
gimp_context_get_foreground (context, &foreground);
gimp_rgb_set_alpha (&foreground, 1.0);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
gimp_value_set_rgb (&return_vals->values[1], &foreground);
return return_vals;
@@ -194,7 +198,8 @@
gimp_context_set_foreground (context, &foreground);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -211,7 +216,7 @@
gimp_context_get_background (context, &background);
gimp_rgb_set_alpha (&background, 1.0);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
gimp_value_set_rgb (&return_vals->values[1], &background);
return return_vals;
@@ -236,7 +241,8 @@
gimp_context_set_background (context, &background);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -249,7 +255,7 @@
{
gimp_context_set_default_colors (context);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -262,7 +268,7 @@
{
gimp_context_swap_colors (context);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -278,7 +284,7 @@
opacity = gimp_context_get_opacity (context) * 100.0;
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_double (&return_vals->values[1], opacity);
return return_vals;
@@ -302,7 +308,8 @@
gimp_context_set_opacity (context, opacity / 100.0);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -318,7 +325,7 @@
paint_mode = gimp_context_get_paint_mode (context);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_enum (&return_vals->values[1], paint_mode);
return return_vals;
@@ -342,7 +349,8 @@
gimp_context_set_paint_mode (context, paint_mode);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -364,7 +372,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -395,7 +404,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -417,7 +427,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -448,7 +459,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -470,7 +482,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -501,7 +514,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -523,7 +537,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -554,7 +569,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -576,7 +592,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -607,7 +624,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/convert-cmds.c
==============================================================================
--- trunk/app/pdb/convert-cmds.c (original)
+++ trunk/app/pdb/convert-cmds.c Sat Aug 16 13:57:57 2008
@@ -65,7 +65,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -95,7 +96,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -168,7 +170,8 @@
NULL, error);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -195,7 +198,8 @@
gimp_image_convert_set_dither_matrix (matrix, width, height);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/display-cmds.c
==============================================================================
--- trunk/app/pdb/display-cmds.c (original)
+++ trunk/app/pdb/display-cmds.c Sat Aug 16 13:57:57 2008
@@ -50,7 +50,7 @@
valid = (display != NULL);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_boolean (&return_vals->values[1], valid);
return return_vals;
@@ -89,7 +89,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_display (&return_vals->values[1], display);
@@ -115,7 +116,8 @@
gimp_delete_display (gimp, display);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -138,7 +140,8 @@
window = (gint32) gimp_get_display_window (gimp, display);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], window);
@@ -156,7 +159,7 @@
{
gimp_container_foreach (gimp->images, (GFunc) gimp_image_flush, NULL);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -190,7 +193,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/drawable-cmds.c
==============================================================================
--- trunk/app/pdb/drawable-cmds.c (original)
+++ trunk/app/pdb/drawable-cmds.c Sat Aug 16 13:57:57 2008
@@ -68,7 +68,7 @@
valid = (GIMP_IS_DRAWABLE (drawable) &&
! gimp_item_is_removed (GIMP_ITEM (drawable)));
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_boolean (&return_vals->values[1], valid);
return return_vals;
@@ -94,7 +94,8 @@
layer = GIMP_IS_LAYER (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], layer);
@@ -122,7 +123,8 @@
text_layer = gimp_drawable_is_text_layer (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], text_layer);
@@ -150,7 +152,8 @@
layer_mask = GIMP_IS_LAYER_MASK (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], layer_mask);
@@ -178,7 +181,8 @@
channel = GIMP_IS_CHANNEL (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], channel);
@@ -206,7 +210,8 @@
type = gimp_drawable_type (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], type);
@@ -234,7 +239,8 @@
type_with_alpha = gimp_drawable_type_with_alpha (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], type_with_alpha);
@@ -262,7 +268,8 @@
has_alpha = gimp_drawable_has_alpha (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], has_alpha);
@@ -290,7 +297,8 @@
is_rgb = gimp_drawable_is_rgb (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], is_rgb);
@@ -318,7 +326,8 @@
is_gray = gimp_drawable_is_gray (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], is_gray);
@@ -346,7 +355,8 @@
is_indexed = gimp_drawable_is_indexed (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], is_indexed);
@@ -374,7 +384,8 @@
bpp = gimp_drawable_bytes (drawable);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], bpp);
@@ -402,7 +413,8 @@
width = gimp_item_width (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], width);
@@ -430,7 +442,8 @@
height = gimp_item_height (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], height);
@@ -459,7 +472,8 @@
gimp_item_offsets (GIMP_ITEM (drawable), &offset_x, &offset_y);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -494,7 +508,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -517,7 +532,8 @@
image = gimp_item_get_image (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -546,7 +562,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -569,7 +586,8 @@
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (drawable)));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -597,7 +615,8 @@
success = gimp_item_rename (GIMP_ITEM (drawable), name, error);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -620,7 +639,8 @@
visible = gimp_item_get_visible (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], visible);
@@ -648,7 +668,8 @@
gimp_item_set_visible (GIMP_ITEM (drawable), visible, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -671,7 +692,8 @@
linked = gimp_item_get_linked (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], linked);
@@ -699,7 +721,8 @@
gimp_item_set_linked (GIMP_ITEM (drawable), linked, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -722,7 +745,8 @@
tattoo = gimp_item_get_tattoo (GIMP_ITEM (drawable));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_uint (&return_vals->values[1], tattoo);
@@ -750,7 +774,8 @@
gimp_item_set_tattoo (GIMP_ITEM (drawable), tattoo);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -777,7 +802,8 @@
non_empty = gimp_drawable_mask_bounds (drawable, &x1, &y1, &x2, &y2);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -815,7 +841,8 @@
non_empty = gimp_drawable_mask_intersect (drawable, &x, &y, &width, &height);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -859,7 +886,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -884,7 +912,8 @@
gimp_drawable_free_shadow_tiles (drawable);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -913,7 +942,8 @@
gimp_drawable_update (drawable, x, y, width, height);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -965,7 +995,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1024,7 +1055,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1047,7 +1079,8 @@
gimp_drawable_fill_by_type (drawable, context, (GimpFillType) fill_type);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1080,7 +1113,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1147,7 +1181,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1229,7 +1264,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1268,7 +1304,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/drawable-transform-cmds.c
==============================================================================
--- trunk/app/pdb/drawable-transform-cmds.c (original)
+++ trunk/app/pdb/drawable-transform-cmds.c Sat Aug 16 13:57:57 2008
@@ -81,7 +81,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -157,7 +158,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -231,7 +233,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -317,7 +320,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -401,7 +405,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -449,7 +454,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -529,7 +535,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -607,7 +614,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -684,7 +692,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -759,7 +768,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -832,7 +842,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -903,7 +914,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -987,7 +999,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -1069,7 +1082,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -1161,7 +1175,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -1251,7 +1266,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
Modified: trunk/app/pdb/edit-cmds.c
==============================================================================
--- trunk/app/pdb/edit-cmds.c (original)
+++ trunk/app/pdb/edit-cmds.c Sat Aug 16 13:57:57 2008
@@ -82,7 +82,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], non_empty);
@@ -125,7 +126,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], non_empty);
@@ -162,7 +164,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], non_empty);
@@ -203,7 +206,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], floating_sel);
@@ -235,7 +239,8 @@
image = NULL;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -285,7 +290,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], real_name);
@@ -335,7 +341,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], real_name);
@@ -379,7 +386,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], real_name);
@@ -422,7 +430,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], floating_sel);
@@ -460,7 +469,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -493,7 +503,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -524,7 +535,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -575,7 +587,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -630,7 +643,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -711,7 +725,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -746,7 +761,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -783,7 +799,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/fileops-cmds.c
==============================================================================
--- trunk/app/pdb/fileops-cmds.c (original)
+++ trunk/app/pdb/fileops-cmds.c Sat Aug 16 13:57:57 2008
@@ -66,7 +66,8 @@
error);
if (! uri)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
file_proc =
file_procedure_find (gimp->plug_in_manager->load_procs, uri, error);
@@ -74,7 +75,8 @@
g_free (uri);
if (! file_proc)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
proc = GIMP_PROCEDURE (file_proc);
@@ -153,7 +155,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -217,7 +220,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -248,7 +252,8 @@
error);
if (! uri)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
file_proc =
file_procedure_find (gimp->plug_in_manager->save_procs, uri, error);
@@ -256,7 +261,8 @@
g_free (uri);
if (! file_proc)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
proc = GIMP_PROCEDURE (file_proc);
@@ -316,7 +322,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -349,7 +356,8 @@
success = file_utils_save_thumbnail (image, filename);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -372,7 +380,8 @@
name = gimp_get_temp_filename (gimp, extension);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -410,7 +419,8 @@
g_free (canonical);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -441,7 +451,8 @@
g_free (canonical);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -472,7 +483,8 @@
g_free (canonical);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -500,7 +512,8 @@
g_free (canonical);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -530,7 +543,8 @@
g_free (canon_thumb);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/floating-sel-cmds.c
==============================================================================
--- trunk/app/pdb/floating-sel-cmds.c (original)
+++ trunk/app/pdb/floating-sel-cmds.c Sat Aug 16 13:57:57 2008
@@ -66,7 +66,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -97,7 +98,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -128,7 +130,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -154,7 +157,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -187,7 +191,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -220,7 +225,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/font-select-cmds.c
==============================================================================
--- trunk/app/pdb/font-select-cmds.c (original)
+++ trunk/app/pdb/font-select-cmds.c Sat Aug 16 13:57:57 2008
@@ -59,7 +59,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -83,7 +84,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -110,7 +112,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/fonts-cmds.c
==============================================================================
--- trunk/app/pdb/fonts-cmds.c (original)
+++ trunk/app/pdb/fonts-cmds.c Sat Aug 16 13:57:57 2008
@@ -45,7 +45,7 @@
{
gimp_fonts_load (gimp);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -70,7 +70,8 @@
filter, &num_fonts);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/gimppdb.c
==============================================================================
--- trunk/app/pdb/gimppdb.c (original)
+++ trunk/app/pdb/gimppdb.c Sat Aug 16 13:57:57 2008
@@ -302,12 +302,12 @@
if (list == NULL)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_PROCEDURE_NOT_FOUND,
- _("PDB calling error:\n"
- "Procedure '%s' not found"), name);
+ GError *pdb_error = g_error_new (GIMP_PDB_ERROR,
+ GIMP_PDB_PROCEDURE_NOT_FOUND,
+ _("Procedure '%s' not found"), name);
- return_vals = gimp_procedure_get_return_values (NULL, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_CALLING_ERROR);
+ return_vals = gimp_procedure_get_return_values (NULL, FALSE, pdb_error);
+ g_propagate_error (error, pdb_error);
return return_vals;
}
@@ -370,14 +370,14 @@
procedure = gimp_pdb_lookup_procedure (pdb, name);
- if (procedure == NULL)
+ if (! procedure)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_PROCEDURE_NOT_FOUND,
- _("PDB calling error:\n"
- "Procedure '%s' not found"), name);
+ GError *pdb_error = g_error_new (GIMP_PDB_ERROR,
+ GIMP_PDB_PROCEDURE_NOT_FOUND,
+ _("Procedure '%s' not found"), name);
- return_vals = gimp_procedure_get_return_values (NULL, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_CALLING_ERROR);
+ return_vals = gimp_procedure_get_return_values (NULL, FALSE, pdb_error);
+ g_propagate_error (error, pdb_error);
return return_vals;
}
@@ -401,19 +401,22 @@
if (arg_type != G_VALUE_TYPE (value))
{
+ GError *pdb_error;
const gchar *expected = g_type_name (G_VALUE_TYPE (value));
const gchar *got = g_type_name (arg_type);
g_value_array_free (args);
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
- _("PDB calling error for procedure '%s':\n"
- "Argument #%d type mismatch (expected %s, got %s)"),
- gimp_object_get_name (GIMP_OBJECT (procedure)),
- i + 1, expected, got);
-
- return_vals = gimp_procedure_get_return_values (procedure, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_CALLING_ERROR);
+ pdb_error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ _("Procedure '%s' called with wrong "
+ "type for argument #%d "
+ "(expected %s, got %s)"),
+ gimp_object_get_name (GIMP_OBJECT (procedure)),
+ i + 1, expected, got);
+
+ return_vals = gimp_procedure_get_return_values (procedure,
+ FALSE, pdb_error);
+ g_propagate_error (error, pdb_error);
va_end (va_args);
@@ -424,13 +427,18 @@
if (error_msg)
{
+ GError *pdb_error = g_error_new (GIMP_PDB_ERROR,
+ GIMP_PDB_INTERNAL_ERROR,
+ "%s", error_msg);
+
g_warning ("%s: %s", G_STRFUNC, error_msg);
g_free (error_msg);
g_value_array_free (args);
- return_vals = gimp_procedure_get_return_values (procedure, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_CALLING_ERROR);
+ return_vals = gimp_procedure_get_return_values (procedure,
+ FALSE, pdb_error);
+ g_propagate_error (error, pdb_error);
va_end (va_args);
Modified: trunk/app/pdb/gimppdberror.h
==============================================================================
--- trunk/app/pdb/gimppdberror.h (original)
+++ trunk/app/pdb/gimppdberror.h Sat Aug 16 13:57:57 2008
@@ -23,7 +23,10 @@
typedef enum
{
GIMP_PDB_PROCEDURE_NOT_FOUND,
- GIMP_PDB_INVALID_ARGUMENT
+ GIMP_PDB_INVALID_ARGUMENT,
+ GIMP_PDB_INVALID_RETURN_VALUE,
+ GIMP_PDB_CANCELLED,
+ GIMP_PDB_INTERNAL_ERROR
} GimpPdbErrorCode;
Modified: trunk/app/pdb/gimpprocedure.c
==============================================================================
--- trunk/app/pdb/gimpprocedure.c (original)
+++ trunk/app/pdb/gimpprocedure.c Sat Aug 16 13:57:57 2008
@@ -303,7 +303,8 @@
GValueArray *args,
GError **error)
{
- GValueArray *return_vals = NULL;
+ GValueArray *return_vals;
+ GError *pdb_error = NULL;
g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure), NULL);
g_return_val_if_fail (GIMP_IS_GIMP (gimp), NULL);
@@ -314,10 +315,11 @@
if (! gimp_procedure_validate_args (procedure,
procedure->args, procedure->num_args,
- args, FALSE, error))
+ args, FALSE, &pdb_error))
{
- return_vals = gimp_procedure_get_return_values (procedure, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_CALLING_ERROR);
+ return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+ pdb_error);
+ g_propagate_error (error, pdb_error);
return return_vals;
}
@@ -330,13 +332,15 @@
args,
error);
- /* If there are no return arguments, assume an execution error */
if (! return_vals)
{
- return_vals = gimp_procedure_get_return_values (procedure, FALSE);
- g_value_set_enum (return_vals->values, GIMP_PDB_EXECUTION_ERROR);
-
- return return_vals;
+ pdb_error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
+ _("Procedure '%s' returned no return values"),
+ gimp_object_get_name (GIMP_OBJECT (procedure)));
+
+ return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+ pdb_error);
+ g_propagate_error (error, pdb_error);
}
return return_vals;
@@ -392,36 +396,74 @@
GValueArray *
gimp_procedure_get_return_values (GimpProcedure *procedure,
- gboolean success)
+ gboolean success,
+ const GError *error)
{
GValueArray *args;
GValue value = { 0, };
- gint n_args;
gint i;
- g_return_val_if_fail (GIMP_IS_PROCEDURE (procedure) ||
- success == FALSE, NULL);
+ g_return_val_if_fail (success == FALSE || GIMP_IS_PROCEDURE (procedure),
+ NULL);
+
+ if (success)
+ {
+ args = g_value_array_new (procedure->num_values + 1);
+
+ g_value_init (&value, GIMP_TYPE_PDB_STATUS_TYPE);
+ g_value_set_enum (&value, GIMP_PDB_SUCCESS);
+ g_value_array_append (args, &value);
+ g_value_unset (&value);
- if (procedure)
- n_args = procedure->num_values + 1;
+ for (i = 0; i < procedure->num_values; i++)
+ {
+ g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (procedure->values[i]));
+ g_value_array_append (args, &value);
+ g_value_unset (&value);
+ }
+ }
else
- n_args = 1;
+ {
+ args = g_value_array_new ((error && error->message) ? 2 : 1);
+
+ g_value_init (&value, GIMP_TYPE_PDB_STATUS_TYPE);
+
+ /* errors in the GIMP_PDB_ERROR domain are calling errors */
+ if (error && error->domain == GIMP_PDB_ERROR)
+ {
+ switch ((GimpPdbErrorCode) error->code)
+ {
+ case GIMP_PDB_PROCEDURE_NOT_FOUND:
+ case GIMP_PDB_INVALID_ARGUMENT:
+ case GIMP_PDB_INVALID_RETURN_VALUE:
+ case GIMP_PDB_INTERNAL_ERROR:
+ g_value_set_enum (&value, GIMP_PDB_CALLING_ERROR);
+ break;
+
+ case GIMP_PDB_CANCELLED:
+ g_value_set_enum (&value, GIMP_PDB_CANCEL);
+ break;
- args = g_value_array_new (n_args);
+ default:
+ g_assert_not_reached ();
+ }
+ }
+ else
+ {
+ g_value_set_enum (&value, GIMP_PDB_EXECUTION_ERROR);
+ }
+
+ g_value_array_append (args, &value);
+ g_value_unset (&value);
- g_value_init (&value, GIMP_TYPE_PDB_STATUS_TYPE);
- g_value_set_enum (&value,
- success ? GIMP_PDB_SUCCESS : GIMP_PDB_EXECUTION_ERROR);
- g_value_array_append (args, &value);
- g_value_unset (&value);
-
- if (procedure)
- for (i = 0; i < procedure->num_values; i++)
- {
- g_value_init (&value, G_PARAM_SPEC_VALUE_TYPE (procedure->values[i]));
- g_value_array_append (args, &value);
- g_value_unset (&value);
- }
+ if (error && error->message)
+ {
+ g_value_init (&value, G_TYPE_STRING);
+ g_value_set_string (&value, error->message);
+ g_value_array_append (args, &value);
+ g_value_unset (&value);
+ }
+ }
return args;
}
@@ -511,7 +553,8 @@
{
if (return_vals)
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ g_set_error (error,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned a wrong value type "
"for return value '%s' (#%d). "
"Expected %s, got %s."),
@@ -522,7 +565,8 @@
}
else
{
- g_set_error (error, GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ g_set_error (error,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
_("Procedure '%s' has been called with a "
"wrong value type for argument '%s' (#%d). "
"Expected %s, got %s."),
@@ -554,7 +598,7 @@
if (return_vals)
{
g_set_error (error,
- GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned an "
"invalid ID for argument '%s'. "
"Most likely a plug-in is trying "
@@ -582,7 +626,7 @@
if (return_vals)
{
g_set_error (error,
- GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned an "
"invalid ID for argument '%s'. "
"Most likely a plug-in is trying "
@@ -614,7 +658,7 @@
if (return_vals)
{
g_set_error (error,
- GIMP_PDB_ERROR, GIMP_PDB_INVALID_ARGUMENT,
+ GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
_("Procedure '%s' returned "
"'%s' as return value '%s' "
"(#%d, type %s). "
Modified: trunk/app/pdb/gimpprocedure.h
==============================================================================
--- trunk/app/pdb/gimpprocedure.h (original)
+++ trunk/app/pdb/gimpprocedure.h Sat Aug 16 13:57:57 2008
@@ -121,7 +121,8 @@
GValueArray * gimp_procedure_get_arguments (GimpProcedure *procedure);
GValueArray * gimp_procedure_get_return_values (GimpProcedure *procedure,
- gboolean success);
+ gboolean success,
+ const GError *error);
GValueArray * gimp_procedure_execute (GimpProcedure *procedure,
Gimp *gimp,
Modified: trunk/app/pdb/gimprc-cmds.c
==============================================================================
--- trunk/app/pdb/gimprc-cmds.c (original)
+++ trunk/app/pdb/gimprc-cmds.c Sat Aug 16 13:57:57 2008
@@ -70,7 +70,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], value);
@@ -104,7 +105,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -120,7 +122,7 @@
comment = g_strdup (gimp->config->default_image->comment);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], comment);
return return_vals;
@@ -139,7 +141,7 @@
unit_id = gimp_get_default_unit ();
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], unit_id);
return return_vals;
@@ -160,7 +162,7 @@
xres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_xres;
yres = GIMP_DISPLAY_CONFIG (gimp->config)->monitor_yres;
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_double (&return_vals->values[1], xres);
g_value_set_double (&return_vals->values[2], yres);
@@ -181,7 +183,7 @@
theme_dir = g_strdup (gimp_get_theme_dir (gimp));
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], theme_dir);
return return_vals;
@@ -200,7 +202,7 @@
config = gimp_config_serialize_to_string (GIMP_CONFIG (gimp->config->color_management), NULL);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], config);
return return_vals;
@@ -219,7 +221,7 @@
load_inhibit = g_strdup (gimp_module_db_get_load_inhibit (gimp->module_db));
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], load_inhibit);
return return_vals;
Modified: trunk/app/pdb/gradient-cmds.c
==============================================================================
--- trunk/app/pdb/gradient-cmds.c (original)
+++ trunk/app/pdb/gradient-cmds.c Sat Aug 16 13:57:57 2008
@@ -114,7 +114,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -156,7 +157,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], copy_name);
@@ -189,7 +191,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], editable);
@@ -227,7 +230,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -260,7 +264,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -294,7 +299,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], num_segments);
@@ -356,7 +362,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -422,7 +429,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -467,7 +475,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -513,7 +522,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -550,7 +560,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -596,7 +607,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -631,7 +643,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], pos);
@@ -673,7 +686,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], final_pos);
@@ -713,7 +727,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], pos);
@@ -756,7 +771,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], final_pos);
@@ -796,7 +812,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], pos);
@@ -839,7 +856,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], final_pos);
@@ -879,7 +897,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], blend_func);
@@ -919,7 +938,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], coloring_type);
@@ -965,7 +985,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1006,7 +1027,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1045,7 +1067,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1087,7 +1110,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1126,7 +1150,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1168,7 +1193,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1207,7 +1233,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1245,7 +1272,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1286,7 +1314,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1327,7 +1356,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1373,7 +1403,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], final_delta);
Modified: trunk/app/pdb/gradient-select-cmds.c
==============================================================================
--- trunk/app/pdb/gradient-select-cmds.c (original)
+++ trunk/app/pdb/gradient-select-cmds.c Sat Aug 16 13:57:57 2008
@@ -68,7 +68,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -93,7 +94,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -121,7 +123,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/gradients-cmds.c
==============================================================================
--- trunk/app/pdb/gradients-cmds.c (original)
+++ trunk/app/pdb/gradients-cmds.c Sat Aug 16 13:57:57 2008
@@ -49,7 +49,7 @@
{
gimp_data_factory_data_refresh (gimp->gradient_factory);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -74,7 +74,8 @@
filter, &num_gradients);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -134,7 +135,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -192,7 +194,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -269,7 +272,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/grid-cmds.c
==============================================================================
--- trunk/app/pdb/grid-cmds.c (original)
+++ trunk/app/pdb/grid-cmds.c Sat Aug 16 13:57:57 2008
@@ -66,7 +66,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -107,7 +108,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -139,7 +141,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -180,7 +183,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -208,7 +212,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &fgcolor);
@@ -241,7 +246,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -269,7 +275,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &bgcolor);
@@ -302,7 +309,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -330,7 +338,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], style);
@@ -363,7 +372,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/guides-cmds.c
==============================================================================
--- trunk/app/pdb/guides-cmds.c (original)
+++ trunk/app/pdb/guides-cmds.c Sat Aug 16 13:57:57 2008
@@ -65,7 +65,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_uint (&return_vals->values[1], guide);
@@ -103,7 +104,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_uint (&return_vals->values[1], guide);
@@ -136,7 +138,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -164,7 +167,8 @@
next_guide = gimp_guide_get_ID (g);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_uint (&return_vals->values[1], next_guide);
@@ -199,7 +203,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], orientation);
@@ -234,7 +239,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], position);
Modified: trunk/app/pdb/help-cmds.c
==============================================================================
--- trunk/app/pdb/help-cmds.c (original)
+++ trunk/app/pdb/help-cmds.c Sat Aug 16 13:57:57 2008
@@ -63,7 +63,8 @@
gimp_help (gimp, progress, help_domain, help_id);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/image-cmds.c
==============================================================================
--- trunk/app/pdb/image-cmds.c (original)
+++ trunk/app/pdb/image-cmds.c Sat Aug 16 13:57:57 2008
@@ -87,7 +87,7 @@
valid = GIMP_IS_IMAGE (image);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_boolean (&return_vals->values[1], valid);
return return_vals;
@@ -119,7 +119,7 @@
image_ids[i] = gimp_image_get_ID (GIMP_IMAGE (list->data));
}
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_images);
gimp_value_take_int32array (&return_vals->values[2], image_ids, num_images);
@@ -154,7 +154,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -185,7 +186,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], new_image);
@@ -214,7 +216,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -237,7 +240,8 @@
base_type = gimp_image_base_type (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], base_type);
@@ -265,7 +269,8 @@
width = gimp_image_get_width (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], width);
@@ -293,7 +298,8 @@
height = gimp_image_get_height (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], height);
@@ -318,7 +324,8 @@
{
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -348,7 +355,8 @@
new_width, new_height, offx, offy, NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -369,7 +377,8 @@
gimp_image_resize_to_layers (image, context, NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -396,7 +405,8 @@
NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -433,7 +443,8 @@
FALSE, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -456,7 +467,8 @@
gimp_image_flip (image, context, flip_type, NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -479,7 +491,8 @@
gimp_image_rotate (image, context, rotate_type, NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -515,7 +528,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -559,7 +573,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -603,7 +618,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -634,7 +650,8 @@
drawable = gimp_image_get_active_drawable (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -660,7 +677,8 @@
gimp_image_unset_active_channel (image);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -683,7 +701,8 @@
floating_sel = gimp_image_floating_sel (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], floating_sel);
@@ -716,7 +735,8 @@
drawable = NULL;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -782,7 +802,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &color);
@@ -814,7 +835,8 @@
layer = gimp_image_pick_correlate_layer (image, x, y);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -854,7 +876,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -877,7 +900,8 @@
gimp_image_remove_layer (image, layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -905,7 +929,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], position);
@@ -933,7 +958,8 @@
success = gimp_image_raise_layer (image, layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -956,7 +982,8 @@
success = gimp_image_lower_layer (image, layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -979,7 +1006,8 @@
success = gimp_image_raise_layer_to_top (image, layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1002,7 +1030,8 @@
success = gimp_image_lower_layer_to_bottom (image, layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1034,7 +1063,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1057,7 +1087,8 @@
gimp_image_remove_channel (image, channel);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1085,7 +1116,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], position);
@@ -1113,7 +1145,8 @@
success = gimp_image_raise_channel (image, channel);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1136,7 +1169,8 @@
success = gimp_image_lower_channel (image, channel);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1168,7 +1202,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1191,7 +1226,8 @@
gimp_image_remove_vectors (image, vectors);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1219,7 +1255,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], position);
@@ -1247,7 +1284,8 @@
success = gimp_image_raise_vectors (image, vectors);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1270,7 +1308,8 @@
success = gimp_image_lower_vectors (image, vectors);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1293,7 +1332,8 @@
success = gimp_image_raise_vectors_to_top (image, vectors);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1316,7 +1356,8 @@
success = gimp_image_lower_vectors_to_bottom (image, vectors);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1342,7 +1383,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -1375,7 +1417,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -1410,7 +1453,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -1441,7 +1485,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1466,7 +1511,8 @@
gimp_layer_apply_mask (layer, mode, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1491,7 +1537,8 @@
colormap = g_memdup (gimp_image_get_colormap (image), num_bytes);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1524,7 +1571,8 @@
gimp_image_set_colormap (image, colormap, num_bytes / 3, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1545,7 +1593,8 @@
gimp_image_clean_all (image);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1568,7 +1617,8 @@
dirty = (image->dirty != 0);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], dirty);
@@ -1635,7 +1685,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1669,7 +1720,8 @@
active_layer = gimp_image_get_active_layer (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], active_layer);
@@ -1698,7 +1750,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1721,7 +1774,8 @@
active_channel = gimp_image_get_active_channel (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], active_channel);
@@ -1750,7 +1804,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1773,7 +1828,8 @@
active_vectors = gimp_image_get_active_vectors (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_vectors (&return_vals->values[1], active_vectors);
@@ -1802,7 +1858,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1828,7 +1885,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_selection (&return_vals->values[1], selection);
@@ -1866,7 +1924,8 @@
active = gimp_image_get_component_active (image, component);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], active);
@@ -1904,7 +1963,8 @@
gimp_image_set_component_active (image, component, active);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1937,7 +1997,8 @@
visible = gimp_image_get_component_visible (image, component);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], visible);
@@ -1975,7 +2036,8 @@
gimp_image_set_component_visible (image, component, visible);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1998,7 +2060,8 @@
filename = gimp_image_get_filename (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], filename);
@@ -2044,7 +2107,8 @@
gimp_image_set_filename (image, filename);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -2072,7 +2136,8 @@
name = g_strdup (_("Untitled"));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -2101,7 +2166,8 @@
gimp_image_get_resolution (image, &xresolution, &yresolution);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -2147,7 +2213,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -2170,7 +2237,8 @@
unit = gimp_image_get_unit (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], unit);
@@ -2198,7 +2266,8 @@
gimp_image_set_unit (image, unit);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -2221,7 +2290,8 @@
tattoo_state = gimp_image_get_tattoo_state (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_uint (&return_vals->values[1], tattoo_state);
@@ -2249,7 +2319,8 @@
gimp_image_set_tattoo_state (image, tattoo_state);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -2274,7 +2345,8 @@
layer = gimp_image_get_layer_by_tattoo (image, tattoo);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -2304,7 +2376,8 @@
channel = gimp_image_get_channel_by_tattoo (image, tattoo);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], channel);
@@ -2334,7 +2407,8 @@
vectors = gimp_image_get_vectors_by_tattoo (image, tattoo);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_vectors (&return_vals->values[1], vectors);
Modified: trunk/app/pdb/layer-cmds.c
==============================================================================
--- trunk/app/pdb/layer-cmds.c (original)
+++ trunk/app/pdb/layer-cmds.c Sat Aug 16 13:57:57 2008
@@ -81,7 +81,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -119,7 +120,8 @@
GIMP_OPACITY_OPAQUE, GIMP_NORMAL_MODE);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -165,7 +167,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer_copy);
@@ -205,7 +208,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer_copy);
@@ -231,7 +235,8 @@
gimp_layer_add_alpha (layer);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -252,7 +257,8 @@
gimp_layer_flatten (layer, context);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -284,7 +290,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -317,7 +324,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -341,7 +349,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -376,7 +385,8 @@
gimp_image_undo_group_end (image);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -414,7 +424,8 @@
gimp_image_undo_group_end (image);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -455,7 +466,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer_mask (&return_vals->values[1], mask);
@@ -483,7 +495,8 @@
mask = gimp_layer_get_mask (layer);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer_mask (&return_vals->values[1], mask);
@@ -511,7 +524,8 @@
layer = gimp_layer_mask_get_layer (mask);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -542,7 +556,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -568,7 +583,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -591,7 +607,8 @@
is_floating_sel = gimp_layer_is_floating_sel (layer);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], is_floating_sel);
@@ -619,7 +636,8 @@
lock_alpha = gimp_layer_get_lock_alpha (layer);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], lock_alpha);
@@ -647,7 +665,8 @@
gimp_layer_set_lock_alpha (layer, lock_alpha, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -673,7 +692,8 @@
apply_mask = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], apply_mask);
@@ -704,7 +724,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -730,7 +751,8 @@
show_mask = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], show_mask);
@@ -761,7 +783,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -787,7 +810,8 @@
edit_mask = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], edit_mask);
@@ -818,7 +842,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -841,7 +866,8 @@
opacity = gimp_layer_get_opacity (layer) * 100.0;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], opacity);
@@ -869,7 +895,8 @@
gimp_layer_set_opacity (layer, opacity / 100.0, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -892,7 +919,8 @@
mode = gimp_layer_get_mode (layer);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], mode);
@@ -920,7 +948,8 @@
gimp_layer_set_mode (layer, mode, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/message-cmds.c
==============================================================================
--- trunk/app/pdb/message-cmds.c (original)
+++ trunk/app/pdb/message-cmds.c Sat Aug 16 13:57:57 2008
@@ -61,7 +61,8 @@
domain, message);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -77,7 +78,7 @@
handler = gimp->message_handler;
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_enum (&return_vals->values[1], handler);
return return_vals;
@@ -101,7 +102,8 @@
gimp->message_handler = handler;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/misc-cmds.c
==============================================================================
--- trunk/app/pdb/misc-cmds.c (original)
+++ trunk/app/pdb/misc-cmds.c Sat Aug 16 13:57:57 2008
@@ -48,7 +48,7 @@
version = g_strdup (GIMP_VERSION);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], version);
return return_vals;
@@ -67,7 +67,7 @@
pid = get_pid ();
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], pid);
return return_vals;
@@ -91,7 +91,8 @@
gimp_exit (gimp, force);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/paint-tools-cmds.c
==============================================================================
--- trunk/app/pdb/paint-tools-cmds.c (original)
+++ trunk/app/pdb/paint-tools-cmds.c Sat Aug 16 13:57:57 2008
@@ -134,7 +134,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -171,7 +172,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -223,7 +225,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -260,7 +263,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -306,7 +310,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -343,7 +348,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -392,7 +398,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -429,7 +436,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -475,7 +483,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -512,7 +521,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -558,7 +568,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -595,7 +606,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -646,7 +658,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -683,7 +696,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -720,7 +734,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -763,7 +778,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -800,7 +816,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/palette-cmds.c
==============================================================================
--- trunk/app/pdb/palette-cmds.c (original)
+++ trunk/app/pdb/palette-cmds.c Sat Aug 16 13:57:57 2008
@@ -65,7 +65,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -107,7 +108,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], copy_name);
@@ -145,7 +147,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], actual_name);
@@ -178,7 +181,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -206,7 +210,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], editable);
@@ -239,7 +244,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], num_colors);
@@ -284,7 +290,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -320,7 +327,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], num_columns);
@@ -353,7 +361,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -390,7 +399,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], entry_num);
@@ -432,7 +442,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -471,7 +482,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &color);
@@ -517,7 +529,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -556,7 +569,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], entry_name);
@@ -603,7 +617,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/palette-select-cmds.c
==============================================================================
--- trunk/app/pdb/palette-select-cmds.c (original)
+++ trunk/app/pdb/palette-select-cmds.c Sat Aug 16 13:57:57 2008
@@ -61,7 +61,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -86,7 +87,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -114,7 +116,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/palettes-cmds.c
==============================================================================
--- trunk/app/pdb/palettes-cmds.c (original)
+++ trunk/app/pdb/palettes-cmds.c Sat Aug 16 13:57:57 2008
@@ -51,7 +51,7 @@
{
gimp_data_factory_data_refresh (gimp->palette_factory);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -76,7 +76,8 @@
filter, &num_palettes);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -110,7 +111,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -166,7 +168,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/parasite-cmds.c
==============================================================================
--- trunk/app/pdb/parasite-cmds.c (original)
+++ trunk/app/pdb/parasite-cmds.c Sat Aug 16 13:57:57 2008
@@ -60,7 +60,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_boxed (&return_vals->values[1], parasite);
@@ -86,7 +87,8 @@
gimp_parasite_attach (gimp, parasite);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -107,7 +109,8 @@
gimp_parasite_detach (gimp, name);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -124,7 +127,7 @@
parasites = gimp_parasite_list (gimp, &num_parasites);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_parasites);
gimp_value_take_stringarray (&return_vals->values[2], parasites, num_parasites);
@@ -157,7 +160,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_boxed (&return_vals->values[1], parasite);
@@ -185,7 +189,8 @@
gimp_image_parasite_attach (image, parasite);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -208,7 +213,8 @@
gimp_image_parasite_detach (image, name);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -232,7 +238,8 @@
parasites = gimp_image_parasite_list (image, &num_parasites);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -269,7 +276,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_boxed (&return_vals->values[1], parasite);
@@ -297,7 +305,8 @@
gimp_item_parasite_attach (GIMP_ITEM (drawable), parasite);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -320,7 +329,8 @@
gimp_item_parasite_detach (GIMP_ITEM (drawable), name);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -344,7 +354,8 @@
parasites = gimp_item_parasite_list (GIMP_ITEM (drawable), &num_parasites);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -381,7 +392,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_boxed (&return_vals->values[1], parasite);
@@ -409,7 +421,8 @@
gimp_item_parasite_attach (GIMP_ITEM (vectors), parasite);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -432,7 +445,8 @@
gimp_item_parasite_detach (GIMP_ITEM (vectors), name);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -456,7 +470,8 @@
parasites = gimp_item_parasite_list (GIMP_ITEM (vectors), &num_parasites);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/paths-cmds.c
==============================================================================
--- trunk/app/pdb/paths-cmds.c (original)
+++ trunk/app/pdb/paths-cmds.c Sat Aug 16 13:57:57 2008
@@ -67,7 +67,8 @@
path_list = gimp_container_get_name_array (image->vectors, &num_paths);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -103,7 +104,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -136,7 +138,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -164,7 +167,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -228,7 +232,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -304,7 +309,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -341,7 +347,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -416,7 +423,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -455,7 +463,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], tattoo);
@@ -490,7 +499,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -520,7 +530,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -555,7 +566,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], locked);
@@ -590,7 +602,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -636,7 +649,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -664,7 +678,8 @@
merge, scale, -1, NULL, NULL);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/pattern-cmds.c
==============================================================================
--- trunk/app/pdb/pattern-cmds.c (original)
+++ trunk/app/pdb/pattern-cmds.c Sat Aug 16 13:57:57 2008
@@ -69,7 +69,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -118,7 +119,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/pattern-select-cmds.c
==============================================================================
--- trunk/app/pdb/pattern-select-cmds.c (original)
+++ trunk/app/pdb/pattern-select-cmds.c Sat Aug 16 13:57:57 2008
@@ -61,7 +61,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -86,7 +87,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -114,7 +116,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/patterns-cmds.c
==============================================================================
--- trunk/app/pdb/patterns-cmds.c (original)
+++ trunk/app/pdb/patterns-cmds.c Sat Aug 16 13:57:57 2008
@@ -50,7 +50,7 @@
{
gimp_data_factory_data_refresh (gimp->pattern_factory);
- return gimp_procedure_get_return_values (procedure, TRUE);
+ return gimp_procedure_get_return_values (procedure, TRUE, NULL);
}
static GValueArray *
@@ -75,7 +75,8 @@
filter, &num_patterns);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -111,7 +112,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -166,7 +168,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/plug-in-cmds.c
==============================================================================
--- trunk/app/pdb/plug-in-cmds.c (original)
+++ trunk/app/pdb/plug-in-cmds.c Sat Aug 16 13:57:57 2008
@@ -72,7 +72,7 @@
&plugin_real_name,
&plugin_install_time);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_plugins);
gimp_value_take_stringarray (&return_vals->values[2], menu_path, num_plugins);
@@ -120,7 +120,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -153,7 +154,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -187,7 +189,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -220,7 +223,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -270,7 +274,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/procedural-db-cmds.c
==============================================================================
--- trunk/app/pdb/procedural-db-cmds.c (original)
+++ trunk/app/pdb/procedural-db-cmds.c Sat Aug 16 13:57:57 2008
@@ -53,7 +53,7 @@
temp_name = g_strdup_printf ("temp-procedure-number-%d", proc_number++);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_take_string (&return_vals->values[1], temp_name);
return return_vals;
@@ -77,7 +77,8 @@
success = gimp_pdb_dump (gimp->pdb, filename);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -117,7 +118,8 @@
error);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -165,7 +167,8 @@
exists = (procedure != NULL);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], exists);
@@ -212,7 +215,8 @@
g_free (canonical);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -281,7 +285,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -345,7 +350,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -389,7 +395,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -426,7 +433,8 @@
g_free (canonical);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], bytes);
@@ -461,7 +469,8 @@
g_free (canonical);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/progress-cmds.c
==============================================================================
--- trunk/app/pdb/progress-cmds.c (original)
+++ trunk/app/pdb/progress-cmds.c Sat Aug 16 13:57:57 2008
@@ -63,7 +63,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -92,7 +93,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -114,7 +116,8 @@
else
success = FALSE;
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -143,7 +146,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -166,7 +170,8 @@
else
success = FALSE;
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -191,7 +196,8 @@
else
success = FALSE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], window);
@@ -222,7 +228,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -248,7 +255,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -274,7 +282,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/selection-cmds.c
==============================================================================
--- trunk/app/pdb/selection-cmds.c (original)
+++ trunk/app/pdb/selection-cmds.c Sat Aug 16 13:57:57 2008
@@ -66,7 +66,8 @@
&x1, &y1, &x2, &y2);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -104,7 +105,8 @@
value = gimp_pickable_get_opacity_at (GIMP_PICKABLE (gimp_image_get_mask (image)), x, y);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], value);
@@ -132,7 +134,8 @@
is_empty = gimp_channel_is_empty (gimp_image_get_mask (image));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], is_empty);
@@ -163,7 +166,8 @@
offx, offy, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -201,7 +205,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -227,7 +232,8 @@
gimp_channel_invert (gimp_image_get_mask (image), TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -248,7 +254,8 @@
gimp_channel_sharpen (gimp_image_get_mask (image), TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -269,7 +276,8 @@
gimp_channel_all (gimp_image_get_mask (image), TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -290,7 +298,8 @@
gimp_channel_clear (gimp_image_get_mask (image), NULL, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -314,7 +323,8 @@
radius, radius, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -339,7 +349,8 @@
radius, radius, TRUE, TRUE, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -363,7 +374,8 @@
steps, steps, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -387,7 +399,8 @@
steps, steps, FALSE, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -412,7 +425,8 @@
GIMP_CHANNEL_OP_REPLACE, FALSE, 0.0, 0.0);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -444,7 +458,8 @@
FALSE, 0.0, 0.0);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -470,7 +485,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_channel (&return_vals->values[1], channel);
@@ -509,7 +525,8 @@
FALSE, 0.0, 0.0);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/selection-tools-cmds.c
==============================================================================
--- trunk/app/pdb/selection-tools-cmds.c (original)
+++ trunk/app/pdb/selection-tools-cmds.c Sat Aug 16 13:57:57 2008
@@ -83,7 +83,8 @@
feather_radius);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -136,7 +137,8 @@
feather_radius_y);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -181,7 +183,8 @@
TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -223,7 +226,8 @@
TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -273,7 +277,8 @@
feather_radius);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -329,7 +334,8 @@
feather_radius_y);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -371,7 +377,8 @@
TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -424,7 +431,8 @@
TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/text-layer-cmds.c
==============================================================================
--- trunk/app/pdb/text-layer-cmds.c (original)
+++ trunk/app/pdb/text-layer-cmds.c Sat Aug 16 13:57:57 2008
@@ -93,7 +93,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], layer);
@@ -130,7 +131,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], text);
@@ -168,7 +170,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -200,7 +203,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], font);
@@ -238,7 +242,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -272,7 +277,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -316,7 +322,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -350,7 +357,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -394,7 +402,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -426,7 +435,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], antialias);
@@ -464,7 +474,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -496,7 +507,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], kerning);
@@ -534,7 +546,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -566,7 +579,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], language);
@@ -604,7 +618,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -636,7 +651,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], direction);
@@ -674,7 +690,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -706,7 +723,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_enum (&return_vals->values[1], justify);
@@ -744,7 +762,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -774,7 +793,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_rgb (&return_vals->values[1], &color);
@@ -812,7 +832,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -844,7 +865,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], indent);
@@ -882,7 +904,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -914,7 +937,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], line_spacing);
@@ -952,7 +976,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -984,7 +1009,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], letter_spacing);
@@ -1022,7 +1048,8 @@
}
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
void
Modified: trunk/app/pdb/text-tool-cmds.c
==============================================================================
--- trunk/app/pdb/text-tool-cmds.c (original)
+++ trunk/app/pdb/text-tool-cmds.c Sat Aug 16 13:57:57 2008
@@ -88,7 +88,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], text_layer);
@@ -131,7 +132,8 @@
g_free (real_fontname);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -208,7 +210,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_layer (&return_vals->values[1], text_layer);
@@ -265,7 +268,8 @@
g_free (real_fontname);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
Modified: trunk/app/pdb/transform-tools-cmds.c
==============================================================================
--- trunk/app/pdb/transform-tools-cmds.c (original)
+++ trunk/app/pdb/transform-tools-cmds.c Sat Aug 16 13:57:57 2008
@@ -73,7 +73,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -156,7 +157,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -224,7 +226,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -299,7 +302,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -369,7 +373,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
@@ -443,7 +448,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_drawable (&return_vals->values[1], drawable);
Modified: trunk/app/pdb/undo-cmds.c
==============================================================================
--- trunk/app/pdb/undo-cmds.c (original)
+++ trunk/app/pdb/undo-cmds.c Sat Aug 16 13:57:57 2008
@@ -67,7 +67,8 @@
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_MISC, undo_desc);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -94,7 +95,8 @@
gimp_image_undo_group_end (image);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -117,7 +119,8 @@
enabled = gimp_image_undo_is_enabled (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], enabled);
@@ -153,7 +156,8 @@
disabled = gimp_image_undo_disable (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], disabled);
@@ -189,7 +193,8 @@
enabled = gimp_image_undo_enable (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], enabled);
@@ -225,7 +230,8 @@
frozen = gimp_image_undo_freeze (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], frozen);
@@ -261,7 +267,8 @@
thawed = gimp_image_undo_thaw (image);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], thawed);
Modified: trunk/app/pdb/unit-cmds.c
==============================================================================
--- trunk/app/pdb/unit-cmds.c (original)
+++ trunk/app/pdb/unit-cmds.c Sat Aug 16 13:57:57 2008
@@ -47,7 +47,7 @@
num_units = _gimp_unit_get_number_of_units (gimp);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_units);
return return_vals;
@@ -66,7 +66,7 @@
num_units = _gimp_unit_get_number_of_built_in_units (gimp);
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_int (&return_vals->values[1], num_units);
return return_vals;
@@ -105,7 +105,8 @@
symbol, abbreviation, singular, plural);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], unit_id);
@@ -133,7 +134,8 @@
deletion_flag = _gimp_unit_get_deletion_flag (gimp, unit_id);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], deletion_flag);
@@ -161,7 +163,8 @@
_gimp_unit_set_deletion_flag (gimp, unit_id, deletion_flag);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -184,7 +187,8 @@
identifier = g_strdup (_gimp_unit_get_identifier (gimp, unit_id));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], identifier);
@@ -212,7 +216,8 @@
factor = _gimp_unit_get_factor (gimp, unit_id);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], factor);
@@ -240,7 +245,8 @@
digits = _gimp_unit_get_digits (gimp, unit_id);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], digits);
@@ -268,7 +274,8 @@
symbol = g_strdup (_gimp_unit_get_symbol (gimp, unit_id));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], symbol);
@@ -296,7 +303,8 @@
abbreviation = g_strdup (_gimp_unit_get_abbreviation (gimp, unit_id));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], abbreviation);
@@ -324,7 +332,8 @@
singular = g_strdup (_gimp_unit_get_singular (gimp, unit_id));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], singular);
@@ -352,7 +361,8 @@
plural = g_strdup (_gimp_unit_get_plural (gimp, unit_id));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], plural);
Modified: trunk/app/pdb/vectors-cmds.c
==============================================================================
--- trunk/app/pdb/vectors-cmds.c (original)
+++ trunk/app/pdb/vectors-cmds.c Sat Aug 16 13:57:57 2008
@@ -65,7 +65,7 @@
valid = (GIMP_IS_VECTORS (vectors) &&
! gimp_item_is_removed (GIMP_ITEM (vectors)));
- return_vals = gimp_procedure_get_return_values (procedure, TRUE);
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
g_value_set_boolean (&return_vals->values[1], valid);
return return_vals;
@@ -93,7 +93,8 @@
vectors = gimp_vectors_new (image, name);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_vectors (&return_vals->values[1], vectors);
@@ -136,7 +137,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_vectors (&return_vals->values[1], vectors);
@@ -168,7 +170,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_vectors (&return_vals->values[1], vectors_copy);
@@ -196,7 +199,8 @@
image = gimp_item_get_image (GIMP_ITEM (vectors));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -224,7 +228,8 @@
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (vectors)));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], name);
@@ -252,7 +257,8 @@
success = gimp_item_rename (GIMP_ITEM (vectors), name, error);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -275,7 +281,8 @@
visible = gimp_item_get_visible (GIMP_ITEM (vectors));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], visible);
@@ -303,7 +310,8 @@
gimp_item_set_visible (GIMP_ITEM (vectors), visible, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -326,7 +334,8 @@
linked = gimp_item_get_linked (GIMP_ITEM (vectors));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_boolean (&return_vals->values[1], linked);
@@ -354,7 +363,8 @@
gimp_item_set_linked (GIMP_ITEM (vectors), linked, TRUE);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -377,7 +387,8 @@
tattoo = gimp_item_get_tattoo (GIMP_ITEM (vectors));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], tattoo);
@@ -405,7 +416,8 @@
gimp_item_set_tattoo (GIMP_ITEM (vectors), tattoo);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -445,7 +457,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -485,7 +498,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_double (&return_vals->values[1], length);
@@ -534,7 +548,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -572,7 +587,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -600,7 +616,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -632,7 +649,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -664,7 +682,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -698,7 +717,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -730,7 +750,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -766,7 +787,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -823,7 +845,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -892,7 +915,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], stroke_id);
@@ -952,7 +976,8 @@
success = FALSE;
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -996,7 +1021,8 @@
stroke_id = gimp_stroke_get_ID (stroke);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], stroke_id);
@@ -1040,7 +1066,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1087,7 +1114,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1142,7 +1170,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1183,7 +1212,8 @@
stroke_id = gimp_stroke_get_ID (stroke);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_set_int (&return_vals->values[1], stroke_id);
@@ -1232,7 +1262,8 @@
success = FALSE;
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1283,7 +1314,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1344,7 +1376,8 @@
}
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
{
@@ -1377,7 +1410,8 @@
success = gimp_vectors_export_file (image, vectors, filename, error);
}
- return gimp_procedure_get_return_values (procedure, success);
+ return gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
}
static GValueArray *
@@ -1404,7 +1438,8 @@
success = (string != NULL);
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
g_value_take_string (&return_vals->values[1], string);
Modified: trunk/app/plug-in/gimpplugin-message.c
==============================================================================
--- trunk/app/plug-in/gimpplugin-message.c (original)
+++ trunk/app/plug-in/gimpplugin-message.c Sat Aug 16 13:57:57 2008
@@ -37,8 +37,9 @@
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-shadow.h"
-#include "pdb/gimppdb.h"
#include "pdb/gimp-pdb-compat.h"
+#include "pdb/gimppdb.h"
+#include "pdb/gimppdberror.h"
#include "gimpplugin.h"
#include "gimpplugin-cleanup.h"
@@ -502,11 +503,23 @@
if (error)
{
- gimp_message (plug_in->manager->gimp, G_OBJECT (proc_frame->progress),
- GIMP_MESSAGE_ERROR,
- _("PDB calling error for procedure '%s':\n"
- "%s"),
- canonical, error->message);
+ if (error->domain == GIMP_PDB_ERROR)
+ {
+ gimp_message (plug_in->manager->gimp, G_OBJECT (proc_frame->progress),
+ GIMP_MESSAGE_ERROR,
+ _("PDB calling error for procedure '%s':\n"
+ "%s"),
+ canonical, error->message);
+ }
+ else
+ {
+ gimp_message (plug_in->manager->gimp, G_OBJECT (proc_frame->progress),
+ GIMP_MESSAGE_ERROR,
+ _("PDB execution error for procedure '%s':\n"
+ "%s"),
+ canonical, error->message);
+ }
+
g_error_free (error);
}
Modified: trunk/app/plug-in/gimpplugin-progress.c
==============================================================================
--- trunk/app/plug-in/gimpplugin-progress.c (original)
+++ trunk/app/plug-in/gimpplugin-progress.c Sat Aug 16 13:57:57 2008
@@ -30,12 +30,15 @@
#include "core/gimpprogress.h"
#include "pdb/gimppdb.h"
+#include "pdb/gimppdberror.h"
#include "gimpplugin.h"
#include "gimpplugin-progress.h"
#include "gimppluginmanager.h"
#include "gimptemporaryprocedure.h"
+#include "gimp-intl.h"
+
/* local function prototypes */
@@ -326,10 +329,13 @@
if (proc_frame->main_loop)
{
- proc_frame->return_vals = gimp_procedure_get_return_values (NULL,
- FALSE);
+ GError *error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_CANCELLED,
+ "%s", _("Cancelled"));
+
+ proc_frame->return_vals =
+ gimp_procedure_get_return_values (proc_frame->procedure, FALSE, error);
- g_value_set_enum (proc_frame->return_vals->values, GIMP_PDB_CANCEL);
+ g_error_free (error);
}
for (list = plug_in->temp_proc_frames; list; list = g_list_next (list))
@@ -338,8 +344,12 @@
if (proc_frame->main_loop)
{
- proc_frame->return_vals = gimp_procedure_get_return_values (NULL,
- FALSE);
+ GError *error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_CANCELLED,
+ "%s", _("Cancelled"));
+
+ proc_frame->return_vals =
+ gimp_procedure_get_return_values (proc_frame->procedure,
+ FALSE, error);
g_value_set_enum (proc_frame->return_vals->values, GIMP_PDB_CANCEL);
}
Modified: trunk/app/plug-in/gimppluginmanager-call.c
==============================================================================
--- trunk/app/plug-in/gimppluginmanager-call.c (original)
+++ trunk/app/plug-in/gimppluginmanager-call.c Sat Aug 16 13:57:57 2008
@@ -41,6 +41,7 @@
#include "gimpplugin.h"
#include "gimpplugin-message.h"
#include "gimpplugindef.h"
+#include "gimppluginerror.h"
#include "gimppluginmanager.h"
#define __YES_I_NEED_GIMP_PLUG_IN_MANAGER_CALL__
#include "gimppluginmanager-call.h"
@@ -140,7 +141,6 @@
GimpPlugInProcedure *procedure,
GValueArray *args,
gboolean synchronous,
- gboolean destroy_return_vals,
GimpObject *display)
{
GValueArray *return_vals = NULL;
@@ -167,8 +167,19 @@
if (! gimp_plug_in_open (plug_in, GIMP_PLUG_IN_CALL_RUN, FALSE))
{
+ const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
+ GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
+ GIMP_PLUG_IN_EXECUTION_FAILED,
+ _("Failed to run plug-in \"%s\""),
+ name);
+
g_object_unref (plug_in);
- goto done;
+
+ return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+ FALSE, error);
+ g_error_free (error);
+
+ return return_vals;
}
display_ID = display ? gimp_get_display_ID (manager->gimp, display) : -1;
@@ -206,14 +217,22 @@
! gp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
! gimp_wire_flush (plug_in->my_write, plug_in))
{
+ const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
+ GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
+ GIMP_PLUG_IN_EXECUTION_FAILED,
+ _("Failed to run plug-in \"%s\""),
+ name);
+
g_free (config.display_name);
g_free (proc_run.params);
- return_vals =
- gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure), FALSE);
-
g_object_unref (plug_in);
- goto done;
+
+ return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+ FALSE, error);
+ g_error_free (error);
+
+ return return_vals;
}
g_free (config.display_name);
@@ -260,13 +279,6 @@
g_object_unref (plug_in);
}
- done:
- if (return_vals && destroy_return_vals)
- {
- g_value_array_free (return_vals);
- return_vals = NULL;
- }
-
return return_vals;
}
@@ -277,8 +289,7 @@
GimpTemporaryProcedure *procedure,
GValueArray *args)
{
- GValueArray *return_vals = NULL;
- GimpPlugIn *plug_in;
+ GimpPlugIn *plug_in;
g_return_val_if_fail (GIMP_IS_PLUG_IN_MANAGER (manager), NULL);
g_return_val_if_fail (GIMP_IS_CONTEXT (context), NULL);
@@ -291,6 +302,7 @@
if (plug_in)
{
GimpPlugInProcFrame *proc_frame;
+ GValueArray *return_vals;
GPProcRun proc_run;
proc_frame = gimp_plug_in_proc_frame_push (plug_in, context, progress,
@@ -303,13 +315,20 @@
if (! gp_temp_proc_run_write (plug_in->my_write, &proc_run, plug_in) ||
! gimp_wire_flush (plug_in->my_write, plug_in))
{
+ const gchar *name = gimp_object_get_name (GIMP_OBJECT (plug_in));
+ GError *error = g_error_new (GIMP_PLUG_IN_ERROR,
+ GIMP_PLUG_IN_EXECUTION_FAILED,
+ _("Failed to run plug-in \"%s\""),
+ name);
+
g_free (proc_run.params);
gimp_plug_in_proc_frame_pop (plug_in);
- return_vals =
- gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure), FALSE);
+ return_vals = gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+ FALSE, error);
+ g_error_free (error);
- goto done;
+ return return_vals;
}
g_free (proc_run.params);
@@ -327,8 +346,13 @@
gimp_plug_in_proc_frame_unref (proc_frame, plug_in);
g_object_unref (plug_in);
- }
- done:
- return return_vals;
+ return return_vals;
+ }
+ else
+ {
+ /* can we actually ever get here? */
+ return gimp_procedure_get_return_values (GIMP_PROCEDURE (procedure),
+ FALSE, NULL);
+ }
}
Modified: trunk/app/plug-in/gimppluginmanager-call.h
==============================================================================
--- trunk/app/plug-in/gimppluginmanager-call.h (original)
+++ trunk/app/plug-in/gimppluginmanager-call.h Sat Aug 16 13:57:57 2008
@@ -46,7 +46,6 @@
GimpPlugInProcedure *procedure,
GValueArray *args,
gboolean synchronous,
- gboolean destroy_return_vals,
GimpObject *display);
/* Run a temp plug-in proc as if it were a procedure database procedure
Modified: trunk/app/plug-in/gimppluginprocedure.c
==============================================================================
--- trunk/app/plug-in/gimppluginprocedure.c (original)
+++ trunk/app/plug-in/gimppluginprocedure.c Sat Aug 16 13:57:57 2008
@@ -212,7 +212,7 @@
return gimp_plug_in_manager_call_run (gimp->plug_in_manager,
context, progress,
GIMP_PLUG_IN_PROCEDURE (procedure),
- args, TRUE, FALSE, NULL);
+ args, TRUE, NULL);
}
static void
@@ -223,10 +223,19 @@
GValueArray *args,
GimpObject *display)
{
- gimp_plug_in_manager_call_run (gimp->plug_in_manager,
- context, progress,
- GIMP_PLUG_IN_PROCEDURE (procedure),
- args, FALSE, TRUE, display);
+ GimpPlugInProcedure *plug_in_procedure = GIMP_PLUG_IN_PROCEDURE (procedure);
+ GValueArray *return_vals;
+
+ return_vals = gimp_plug_in_manager_call_run (gimp->plug_in_manager,
+ context, progress,
+ plug_in_procedure,
+ args, FALSE, display);
+
+ /* In case of errors, gimp_plug_in_manager_call_run() may return
+ * return_vals, even if run asynchronously.
+ */
+ if (return_vals)
+ g_value_array_free (return_vals);
}
const gchar *
Modified: trunk/app/plug-in/gimppluginprocframe.c
==============================================================================
--- trunk/app/plug-in/gimppluginprocframe.c (original)
+++ trunk/app/plug-in/gimppluginprocframe.c Sat Aug 16 13:57:57 2008
@@ -29,11 +29,15 @@
#include "core/gimpcontext.h"
#include "core/gimpprogress.h"
+#include "pdb/gimppdberror.h"
+
#include "gimpplugin.h"
#include "gimpplugin-cleanup.h"
#include "gimpplugin-progress.h"
#include "gimppluginprocedure.h"
+#include "gimp-intl.h"
+
/* public functions */
@@ -173,7 +177,7 @@
{
/* Allocate new return values of the correct size. */
return_vals = gimp_procedure_get_return_values (proc_frame->procedure,
- FALSE);
+ TRUE, NULL);
/* Copy all of the arguments we can. */
memcpy (return_vals->values, proc_frame->return_vals->values,
@@ -191,9 +195,16 @@
}
else
{
- /* Just return a dummy set of values. */
- return_vals = gimp_procedure_get_return_values (proc_frame->procedure,
- FALSE);
+ GimpProcedure *procedure = proc_frame->procedure;
+ GError *error;
+
+ error = g_error_new (GIMP_PDB_ERROR, GIMP_PDB_INVALID_RETURN_VALUE,
+ _("Procedure '%s' returned no return values"),
+ gimp_object_get_name (GIMP_OBJECT (procedure)));
+
+ return_vals = gimp_procedure_get_return_values (procedure, FALSE,
+ error);
+ g_error_free (error);
}
return return_vals;
Modified: trunk/app/xcf/xcf.c
==============================================================================
--- trunk/app/xcf/xcf.c (original)
+++ trunk/app/xcf/xcf.c Sat Aug 16 13:57:57 2008
@@ -330,7 +330,8 @@
gimp_filename_to_utf8 (filename), g_strerror (save_errno));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
if (success)
gimp_value_set_image (&return_vals->values[1], image);
@@ -422,7 +423,8 @@
gimp_filename_to_utf8 (filename), g_strerror (save_errno));
}
- return_vals = gimp_procedure_get_return_values (procedure, success);
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
gimp_unset_busy (gimp);
Modified: trunk/plug-ins/pygimp/pygimp-pdb.c
==============================================================================
--- trunk/plug-ins/pygimp/pygimp-pdb.c (original)
+++ trunk/plug-ins/pygimp/pygimp-pdb.c Sat Aug 16 13:57:57 2008
@@ -620,9 +620,7 @@
PyObject *
pygimp_pdb_new(void)
{
- PyGimpPDB *self;
-
- self = PyObject_NEW(PyGimpPDB, &PyGimpPDB_Type);
+ PyGimpPDB *self = PyObject_NEW(PyGimpPDB, &PyGimpPDB_Type);
if (self == NULL)
return NULL;
@@ -929,8 +927,11 @@
#if PG_DEBUG > 0
g_printerr("execution error\n");
#endif
+ if (nret > 1 && ret[1].type == GIMP_PDB_STRING)
+ PyErr_SetString(PyExc_RuntimeError, ret[1].data.d_string);
+ else
+ PyErr_SetString(PyExc_RuntimeError, "execution error");
gimp_destroy_params(ret, nret);
- PyErr_SetString(PyExc_RuntimeError, "execution error");
return NULL;
break;
@@ -938,8 +939,11 @@
#if PG_DEBUG > 0
g_printerr("calling error\n");
#endif
+ if (nret > 1 && ret[1].type == GIMP_PDB_STRING)
+ PyErr_SetString(PyExc_RuntimeError, ret[1].data.d_string);
+ else
+ PyErr_SetString(PyExc_RuntimeError, "calling error");
gimp_destroy_params(ret, nret);
- PyErr_SetString(PyExc_TypeError, "invalid arguments");
return NULL;
break;
Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in (original)
+++ trunk/po/POTFILES.in Sat Aug 16 13:57:57 2008
@@ -274,6 +274,7 @@
app/plug-in/gimppluginmanager-restore.c
app/plug-in/gimppluginmanager.c
app/plug-in/gimppluginprocedure.c
+app/plug-in/gimppluginprocframe.c
app/plug-in/gimptemporaryprocedure.c
app/plug-in/plug-in-enums.c
app/plug-in/plug-in-icc-profile.c
Modified: trunk/tools/pdbgen/app.pl
==============================================================================
--- trunk/tools/pdbgen/app.pl (original)
+++ trunk/tools/pdbgen/app.pl Sat Aug 16 13:57:57 2008
@@ -128,14 +128,21 @@
sub marshal_outargs {
my $proc = shift;
-
- my $result = <<CODE;
- return_vals = gimp_procedure_get_return_values (procedure, success);
-CODE
-
+ my $result;
my $argc = 0;
my @outargs = @{$proc->{outargs}} if exists $proc->{outargs};
+ if ($success) {
+ $result = <<CODE;
+ return_vals = gimp_procedure_get_return_values (procedure, success,
+ error ? *error : NULL);
+CODE
+ } else {
+ $result = <<CODE;
+ return_vals = gimp_procedure_get_return_values (procedure, TRUE, NULL);
+CODE
+ }
+
if (scalar @outargs) {
my $outargs = "";
@@ -177,13 +184,14 @@
else {
if ($success) {
$result =~ s/return_vals =/return/;
+ $result =~ s/ error/error/;
}
else {
$result =~ s/ return_vals =/\n return/;
+ $result =~ s/ error/error/;
}
}
- $result =~ s/, success\);$/, TRUE);/m unless $success;
$result;
}
Modified: trunk/tools/pdbgen/pdb/fileops.pdb
==============================================================================
--- trunk/tools/pdbgen/pdb/fileops.pdb (original)
+++ trunk/tools/pdbgen/pdb/fileops.pdb Sat Aug 16 13:57:57 2008
@@ -63,7 +63,8 @@
error);
if (! uri)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
file_proc =
file_procedure_find (gimp->plug_in_manager->load_procs, uri, error);
@@ -71,7 +72,8 @@
g_free (uri);
if (! file_proc)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
proc = GIMP_PROCEDURE (file_proc);
@@ -276,7 +278,8 @@
error);
if (! uri)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
file_proc =
file_procedure_find (gimp->plug_in_manager->save_procs, uri, error);
@@ -284,7 +287,8 @@
g_free (uri);
if (! file_proc)
- return gimp_procedure_get_return_values (procedure, FALSE);
+ return gimp_procedure_get_return_values (procedure, FALSE,
+ error ? *error : NULL);
proc = GIMP_PROCEDURE (file_proc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
