dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

special case invalid drawable and image IDs and try to give a somewhat 

2006-11-23  Sven Neumann  <sven@gimp.org>

	* app/pdb/gimpprocedure.c (gimp_procedure_validate_args): special
	case invalid drawable and image IDs and try to give a somewhat
	more helpful error message (addresses bug #378334).
This commit is contained in:
Sven Neumann 2006-11-23 09:17:07 +00:00 committed by Sven Neumann
parent a05eda5af7
commit f95a118603
2 changed files with 53 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-23 Sven Neumann <sven@gimp.org>
* app/pdb/gimpprocedure.c (gimp_procedure_validate_args): special
case invalid drawable and image IDs and try to give a somewhat
more helpful error message (addresses bug #378334).
2006-11-23 Sven Neumann <sven@gimp.org>
* tools/pdbgen/pdb/image.pdb: marked the new functions as new in 2.4.

68
app/pdb/gimpprocedure.c
View File

@ -521,32 +521,58 @@ gimp_procedure_validate_args (GimpProcedure *procedure,
if (g_param_value_validate (pspec, arg))
{
const gchar *type_name = g_type_name (spec_type);
gchar *old_value;
gchar *new_value;
old_value = g_value_dup_string (&string_value);
if (g_value_type_transformable (arg_type, G_TYPE_STRING))
g_value_transform (arg, &string_value);
if (GIMP_IS_PARAM_SPEC_DRAWABLE_ID (pspec) &&
g_value_get_int (arg) == -1)
{
gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
_("Procedure '%s' has been called with an "
"invalid ID for argument '%s'. Most likely "
"a plug-in is trying to work on a layer "
"that doesn't exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
g_param_spec_get_name (pspec));
}
else if (GIMP_IS_PARAM_SPEC_IMAGE_ID (pspec) &&
g_value_get_int (arg) == -1)
{
gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
_("Procedure '%s' has been called with an "
"invalid ID for argument '%s'. Most likely "
"a plug-in is trying to work on an image "
"that doesn't exist any longer."),
gimp_object_get_name (GIMP_OBJECT (procedure)),
g_param_spec_get_name (pspec));
}
else
g_value_set_static_string (&string_value,
"<not transformable to string>");
{
const gchar *type_name = g_type_name (spec_type);
gchar *old_value;
gchar *new_value;
new_value = g_value_dup_string (&string_value);
g_value_unset (&string_value);
old_value = g_value_dup_string (&string_value);
gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
_("PDB calling error for procedure '%s':\n"
"Argument '%s' (#%d, type %s) out of bounds "
"(validation changed '%s' to '%s')"),
gimp_object_get_name (GIMP_OBJECT (procedure)),
g_param_spec_get_name (pspec),
i + 1, type_name,
old_value, new_value);
if (g_value_type_transformable (arg_type, G_TYPE_STRING))
g_value_transform (arg, &string_value);
else
g_value_set_static_string (&string_value,
"<not transformable to string>");
g_free (old_value);
g_free (new_value);
new_value = g_value_dup_string (&string_value);
g_value_unset (&string_value);
gimp_message (gimp, NULL, GIMP_MESSAGE_ERROR,
_("PDB calling error for procedure '%s':\n"
"Argument '%s' (#%d, type %s) out of bounds "
"(validation changed '%s' to '%s')"),
gimp_object_get_name (GIMP_OBJECT (procedure)),
g_param_spec_get_name (pspec),
i + 1, type_name,
old_value, new_value);
g_free (old_value);
g_free (new_value);
}
return FALSE;
}