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

don't send a return value if executing the procedure closed the plug-in 

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

	* app/plug-in/gimpplugin-message.c (gimp_plug_in_handle_proc_run):
	don't send a return value if executing the procedure closed the
	plug-in (as is the case with gimp-quit). Fixes bug #332608.
This commit is contained in:
Michael Natterer 2006-10-27 13:16:51 +00:00 committed by Michael Natterer
parent e3bf33121c
commit 2528519869
2 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2006-10-27 Michael Natterer <mitch@gimp.org>
* app/plug-in/gimpplugin-message.c (gimp_plug_in_handle_proc_run):
don't send a return value if executing the procedure closed the
plug-in (as is the case with gimp-quit). Fixes bug #332608.
2006-10-27 Sven Neumann <sven@gimp.org>
* configure.in

36
app/plug-in/gimpplugin-message.c
View File

@ -355,7 +355,6 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
GimpProcedure *procedure;
GValueArray *args = NULL;
GValueArray *return_vals = NULL;
GPProcReturn proc_return;
canonical = gimp_canonicalize_identifier (proc_run->name);
@ -434,26 +433,35 @@ gimp_plug_in_handle_proc_run (GimpPlugIn *plug_in,
args);
gimp_plug_in_manager_plug_in_pop (plug_in->manager);
g_value_array_free (args);
g_free (canonical);
/* Return the name we got called with, *not* proc_name or canonical,
* since proc_name may have been remapped by gimp->procedural_compat_ht
* and canonical may be different too.
/* Don't bother to send with the return value if executing the
* procedure closed the plug-in (e.g. if the procedure is gimp-quit)
*/
proc_return.name = proc_run->name;
proc_return.nparams = return_vals->n_values;
proc_return.params = plug_in_args_to_params (return_vals, FALSE);
if (! gp_proc_return_write (plug_in->my_write, &proc_return, plug_in))
if (plug_in->open)
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"plug_in_handle_proc_run: ERROR");
gimp_plug_in_close (plug_in, TRUE);
GPProcReturn proc_return;
/* Return the name we got called with, *not* proc_name or canonical,
* since proc_name may have been remapped by gimp->procedural_compat_ht
* and canonical may be different too.
*/
proc_return.name = proc_run->name;
proc_return.nparams = return_vals->n_values;
proc_return.params = plug_in_args_to_params (return_vals, FALSE);
if (! gp_proc_return_write (plug_in->my_write, &proc_return, plug_in))
{
gimp_message (plug_in->manager->gimp, NULL, GIMP_MESSAGE_ERROR,
"plug_in_handle_proc_run: ERROR");
gimp_plug_in_close (plug_in, TRUE);
}
g_free (proc_return.params);
}
g_value_array_free (args);
g_value_array_free (return_vals);
g_free (proc_return.params);
}
static void