Commit 2c083495 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

pass the ProcRecord as first parameter, so marshallers have access to

2006-03-27  Michael Natterer  <mitch@gimp.org>

	* app/pdb/procedural_db.h (ArgMarshal): pass the ProcRecord as
	first parameter, so marshallers have access to their ProcRecord
	without the need for global variables.

	* app/pdb/procedural_db.c
	* tools/pdbgen/app.pl: changed addordingly.

	* tools/pdbgen/app.pl: removed support for invoke->proc. Introduce
	invoke->no_marshalling instead which indicates that invoke->code
	should be used literally as marshaller code, without any
	substitutions or generated variables.

	* tools/pdbgen/pdb/fileops.pdb: changed accordingly.

	* app/pdb/*_cmds.c: regenerated.
parent 2c2e542e
2006-03-27 Michael Natterer <mitch@gimp.org>
* app/pdb/procedural_db.h (ArgMarshal): pass the ProcRecord as
first parameter, so marshallers have access to their ProcRecord
without the need for global variables.
* app/pdb/procedural_db.c
* tools/pdbgen/app.pl: changed addordingly.
* tools/pdbgen/app.pl: removed support for invoke->proc. Introduce
invoke->no_marshalling instead which indicates that invoke->code
should be used literally as marshaller code, without any
substitutions or generated variables.
* tools/pdbgen/pdb/fileops.pdb: changed accordingly.
* app/pdb/*_cmds.c: regenerated.
2006-03-27 Sven Neumann <sven@gimp.org>
* app/tools/gimpforegroundselectoptions.c
......
......@@ -86,7 +86,8 @@ register_brush_procs (Gimp *gimp)
}
static Argument *
brush_new_invoker (Gimp *gimp,
brush_new_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -115,7 +116,7 @@ brush_new_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_new_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_pointer = actual_name;
......@@ -160,7 +161,8 @@ static ProcRecord brush_new_proc =
};
static Argument *
brush_duplicate_invoker (Gimp *gimp,
brush_duplicate_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -194,7 +196,7 @@ brush_duplicate_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_duplicate_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_pointer = copy_name;
......@@ -239,7 +241,8 @@ static ProcRecord brush_duplicate_proc =
};
static Argument *
brush_is_generated_invoker (Gimp *gimp,
brush_is_generated_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -264,7 +267,7 @@ brush_is_generated_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_is_generated_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = generated;
......@@ -309,7 +312,8 @@ static ProcRecord brush_is_generated_proc =
};
static Argument *
brush_rename_invoker (Gimp *gimp,
brush_rename_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -342,7 +346,7 @@ brush_rename_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_rename_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_pointer = actual_name;
......@@ -392,7 +396,8 @@ static ProcRecord brush_rename_proc =
};
static Argument *
brush_delete_invoker (Gimp *gimp,
brush_delete_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -427,7 +432,7 @@ brush_delete_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&brush_delete_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brush_delete_inargs[] =
......@@ -458,7 +463,8 @@ static ProcRecord brush_delete_proc =
};
static Argument *
brush_is_editable_invoker (Gimp *gimp,
brush_is_editable_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -483,7 +489,7 @@ brush_is_editable_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_is_editable_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = editable;
......@@ -528,7 +534,8 @@ static ProcRecord brush_is_editable_proc =
};
static Argument *
brush_get_info_invoker (Gimp *gimp,
brush_get_info_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -561,7 +568,7 @@ brush_get_info_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_info_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......@@ -626,7 +633,8 @@ static ProcRecord brush_get_info_proc =
};
static Argument *
brush_get_pixels_invoker (Gimp *gimp,
brush_get_pixels_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -672,7 +680,7 @@ brush_get_pixels_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_pixels_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......@@ -761,7 +769,8 @@ static ProcRecord brush_get_pixels_proc =
};
static Argument *
brush_get_spacing_invoker (Gimp *gimp,
brush_get_spacing_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -786,7 +795,7 @@ brush_get_spacing_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_spacing_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = spacing;
......@@ -831,7 +840,8 @@ static ProcRecord brush_get_spacing_proc =
};
static Argument *
brush_set_spacing_invoker (Gimp *gimp,
brush_set_spacing_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -859,7 +869,7 @@ brush_set_spacing_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&brush_set_spacing_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brush_set_spacing_inargs[] =
......@@ -895,7 +905,8 @@ static ProcRecord brush_set_spacing_proc =
};
static Argument *
brush_get_shape_invoker (Gimp *gimp,
brush_get_shape_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -920,7 +931,7 @@ brush_get_shape_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_shape_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = shape;
......@@ -965,7 +976,8 @@ static ProcRecord brush_get_shape_proc =
};
static Argument *
brush_get_radius_invoker (Gimp *gimp,
brush_get_radius_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -990,7 +1002,7 @@ brush_get_radius_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_radius_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = radius;
......@@ -1035,7 +1047,8 @@ static ProcRecord brush_get_radius_proc =
};
static Argument *
brush_get_spikes_invoker (Gimp *gimp,
brush_get_spikes_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1060,7 +1073,7 @@ brush_get_spikes_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_spikes_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = spikes;
......@@ -1105,7 +1118,8 @@ static ProcRecord brush_get_spikes_proc =
};
static Argument *
brush_get_hardness_invoker (Gimp *gimp,
brush_get_hardness_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1130,7 +1144,7 @@ brush_get_hardness_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_hardness_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = hardness;
......@@ -1175,7 +1189,8 @@ static ProcRecord brush_get_hardness_proc =
};
static Argument *
brush_get_aspect_ratio_invoker (Gimp *gimp,
brush_get_aspect_ratio_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1200,7 +1215,7 @@ brush_get_aspect_ratio_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_aspect_ratio_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = aspect_ratio;
......@@ -1245,7 +1260,8 @@ static ProcRecord brush_get_aspect_ratio_proc =
};
static Argument *
brush_get_angle_invoker (Gimp *gimp,
brush_get_angle_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1270,7 +1286,7 @@ brush_get_angle_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_get_angle_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = angle;
......@@ -1315,7 +1331,8 @@ static ProcRecord brush_get_angle_proc =
};
static Argument *
brush_set_shape_invoker (Gimp *gimp,
brush_set_shape_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1349,7 +1366,7 @@ brush_set_shape_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_shape_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = shape_out;
......@@ -1399,7 +1416,8 @@ static ProcRecord brush_set_shape_proc =
};
static Argument *
brush_set_radius_invoker (Gimp *gimp,
brush_set_radius_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1431,7 +1449,7 @@ brush_set_radius_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_radius_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = radius_out;
......@@ -1481,7 +1499,8 @@ static ProcRecord brush_set_radius_proc =
};
static Argument *
brush_set_spikes_invoker (Gimp *gimp,
brush_set_spikes_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1513,7 +1532,7 @@ brush_set_spikes_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_spikes_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = spikes_out;
......@@ -1563,7 +1582,8 @@ static ProcRecord brush_set_spikes_proc =
};
static Argument *
brush_set_hardness_invoker (Gimp *gimp,
brush_set_hardness_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1595,7 +1615,7 @@ brush_set_hardness_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_hardness_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = hardness_out;
......@@ -1645,7 +1665,8 @@ static ProcRecord brush_set_hardness_proc =
};
static Argument *
brush_set_aspect_ratio_invoker (Gimp *gimp,
brush_set_aspect_ratio_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1677,7 +1698,7 @@ brush_set_aspect_ratio_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_aspect_ratio_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = aspect_ratio_out;
......@@ -1727,7 +1748,8 @@ static ProcRecord brush_set_aspect_ratio_proc =
};
static Argument *
brush_set_angle_invoker (Gimp *gimp,
brush_set_angle_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -1759,7 +1781,7 @@ brush_set_angle_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brush_set_angle_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_float = angle_out;
......
......@@ -42,7 +42,8 @@ register_brush_select_procs (Gimp *gimp)
}
static Argument *
brushes_popup_invoker (Gimp *gimp,
brushes_popup_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -92,7 +93,7 @@ brushes_popup_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&brushes_popup_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brushes_popup_inargs[] =
......@@ -148,7 +149,8 @@ static ProcRecord brushes_popup_proc =
};
static Argument *
brushes_close_popup_invoker (Gimp *gimp,
brushes_close_popup_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -169,7 +171,7 @@ brushes_close_popup_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&brushes_close_popup_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brushes_close_popup_inargs[] =
......@@ -200,7 +202,8 @@ static ProcRecord brushes_close_popup_proc =
};
static Argument *
brushes_set_popup_invoker (Gimp *gimp,
brushes_set_popup_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -245,7 +248,7 @@ brushes_set_popup_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&brushes_set_popup_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brushes_set_popup_inargs[] =
......
......@@ -54,13 +54,14 @@ register_brushes_procs (Gimp *gimp)
}
static Argument *
brushes_refresh_invoker (Gimp *gimp,
brushes_refresh_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
{
gimp_data_factory_data_refresh (gimp->brush_factory);
return procedural_db_return_args (&brushes_refresh_proc, TRUE);
return procedural_db_return_args (proc_record, TRUE);
}
static ProcRecord brushes_refresh_proc =
......@@ -82,7 +83,8 @@ static ProcRecord brushes_refresh_proc =
};
static Argument *
brushes_get_list_invoker (Gimp *gimp,
brushes_get_list_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -103,7 +105,7 @@ brushes_get_list_invoker (Gimp *gimp,
filter, &num_brushes);
}
return_args = procedural_db_return_args (&brushes_get_list_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......@@ -156,7 +158,8 @@ static ProcRecord brushes_get_list_proc =
};
static Argument *
brushes_get_brush_invoker (Gimp *gimp,
brushes_get_brush_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -180,7 +183,7 @@ brushes_get_brush_invoker (Gimp *gimp,
else
success = FALSE;
return_args = procedural_db_return_args (&brushes_get_brush_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......@@ -236,7 +239,8 @@ static ProcRecord brushes_get_brush_proc =
};
static Argument *
brushes_get_spacing_invoker (Gimp *gimp,
brushes_get_spacing_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -252,7 +256,7 @@ brushes_get_spacing_invoker (Gimp *gimp,
else
success = FALSE;
return_args = procedural_db_return_args (&brushes_get_spacing_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = spacing;
......@@ -288,7 +292,8 @@ static ProcRecord brushes_get_spacing_proc =
};
static Argument *
brushes_set_spacing_invoker (Gimp *gimp,
brushes_set_spacing_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -305,7 +310,7 @@ brushes_set_spacing_invoker (Gimp *gimp,
gimp_brush_set_spacing (gimp_context_get_brush (context), spacing);
}
return procedural_db_return_args (&brushes_set_spacing_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg brushes_set_spacing_inargs[] =
......@@ -336,7 +341,8 @@ static ProcRecord brushes_set_spacing_proc =
};
static Argument *
brushes_get_brush_data_invoker (Gimp *gimp,
brushes_get_brush_data_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -386,7 +392,7 @@ brushes_get_brush_data_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&brushes_get_brush_data_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......
......@@ -54,7 +54,8 @@ register_buffer_procs (Gimp *gimp)
}
static Argument *
buffers_get_list_invoker (Gimp *gimp,
buffers_get_list_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -75,7 +76,7 @@ buffers_get_list_invoker (Gimp *gimp,
filter, &num_buffers);
}
return_args = procedural_db_return_args (&buffers_get_list_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
{
......@@ -128,7 +129,8 @@ static ProcRecord buffers_get_list_proc =
};
static Argument *
buffer_rename_invoker (Gimp *gimp,
buffer_rename_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -161,7 +163,7 @@ buffer_rename_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&buffer_rename_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_pointer = real_name;
......@@ -211,7 +213,8 @@ static ProcRecord buffer_rename_proc =
};
static Argument *
buffer_delete_invoker (Gimp *gimp,
buffer_delete_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -234,7 +237,7 @@ buffer_delete_invoker (Gimp *gimp,
success = FALSE;
}
return procedural_db_return_args (&buffer_delete_proc, success);
return procedural_db_return_args (proc_record, success);
}
static ProcArg buffer_delete_inargs[] =
......@@ -265,7 +268,8 @@ static ProcRecord buffer_delete_proc =
};
static Argument *
buffer_get_width_invoker (Gimp *gimp,
buffer_get_width_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -290,7 +294,7 @@ buffer_get_width_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&buffer_get_width_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = width;
......@@ -335,7 +339,8 @@ static ProcRecord buffer_get_width_proc =
};
static Argument *
buffer_get_height_invoker (Gimp *gimp,
buffer_get_height_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -360,7 +365,7 @@ buffer_get_height_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&buffer_get_height_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = height;
......@@ -405,7 +410,8 @@ static ProcRecord buffer_get_height_proc =
};
static Argument *
buffer_get_bytes_invoker (Gimp *gimp,
buffer_get_bytes_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -430,7 +436,7 @@ buffer_get_bytes_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&buffer_get_bytes_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = bytes;
......@@ -475,7 +481,8 @@ static ProcRecord buffer_get_bytes_proc =
};
static Argument *
buffer_get_image_type_invoker (Gimp *gimp,
buffer_get_image_type_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -500,7 +507,7 @@ buffer_get_image_type_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&buffer_get_image_type_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = image_type;
......
......@@ -59,7 +59,8 @@ register_channel_procs (Gimp *gimp)
}
static Argument *
channel_new_invoker (Gimp *gimp,
channel_new_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -107,7 +108,7 @@ channel_new_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&channel_new_proc, success);
return_args = procedural_db_return_args (proc_record, success);
if (success)
return_args[1].value.pdb_int = channel ? gimp_item_get_ID (GIMP_ITEM (channel)) : -1;
......@@ -177,7 +178,8 @@ static ProcRecord channel_new_proc =
};
static Argument *
channel_new_from_component_invoker (Gimp *gimp,
channel_new_from_component_invoker (ProcRecord *proc_record,
Gimp *gimp,
GimpContext *context,
GimpProgress *progress,
Argument *args)
......@@ -213,7 +215,7 @@ channel_new_from_component_invoker (Gimp *gimp,
success = FALSE;
}
return_args = procedural_db_return_args (&channel_new_from_component_proc, success);
return_args = procedural_db_return_args (proc_record, success);
</