mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 20:41:43 +00:00
0765087a8f
2008-09-10 Michael Natterer <mitch@gimp.org> Change Script-Fu error handling to properly use the new error message passing in PDB return values: * plug-ins/script-fu/script-fu-scripts.[ch]: remove function script_fu_error_msg(). * plug-ins/script-fu/script-fu-interface.c (script_fu_ok): output errors of interactive script-fu dialogs directly here with g_message(). * plug-ins/script-fu/script-fu-scripts.c (script_fu_run_command): add GError and return the error message instead of displaying it. (script_fu_load_script): show the returned error here (and make it more specific than the former script_fu_error_msg() did). (script_fu_script_proc): return error messages via the procedure's return values. * plug-ins/script-fu/scheme-wrapper.c (script_fu_marshal_procedure_call): if an error message was returned from the PDB call, pass it to foreign_error() so it ends up where it should (consle, text console or error string). * plug-ins/script-fu/script-fu-console.c * plug-ins/script-fu/script-fu-text-console.c: set the error handler to PLUGIN while interpreting scheme, we handle errors from calling back into the PDB ourselves now. svn path=/trunk/; revision=26920
62 lines
1.8 KiB
C
62 lines
1.8 KiB
C
/* GIMP - The GNU Image Manipulation Program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <stdio.h>
|
|
#include <errno.h>
|
|
|
|
#if HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include "libgimp/gimp.h"
|
|
|
|
#include "scheme-wrapper.h"
|
|
#include "script-fu-text-console.h"
|
|
|
|
#include "script-fu-intl.h"
|
|
|
|
void
|
|
script_fu_text_console_run (const gchar *name,
|
|
gint nparams,
|
|
const GimpParam *params,
|
|
gint *nreturn_vals,
|
|
GimpParam **return_vals)
|
|
{
|
|
static GimpParam values[1];
|
|
|
|
/* Enable Script-Fu output */
|
|
ts_register_output_func (ts_stdout_output_func, NULL);
|
|
|
|
ts_print_welcome ();
|
|
|
|
gimp_plugin_set_pdb_error_handler (GIMP_PDB_ERROR_HANDLER_PLUGIN);
|
|
|
|
/* Run the interface */
|
|
ts_interpret_stdin ();
|
|
|
|
gimp_plugin_set_pdb_error_handler (GIMP_PDB_ERROR_HANDLER_INTERNAL);
|
|
|
|
values[0].type = GIMP_PDB_STATUS;
|
|
values[0].data.d_status = GIMP_PDB_SUCCESS;
|
|
|
|
*nreturn_vals = 1;
|
|
*return_vals = values;
|
|
}
|