callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always call the batch interpreter in NON-INTERACTIVE mode (see bug

Browse Source 
2005-10-20  Sven Neumann  <sven@gimp.org>

	* app/batch.c (batch_run): always call the batch interpreter in
	NON-INTERACTIVE mode (see bug #167964).

	* plug-ins/script-fu/script-fu-text-console.c: removed the run-mode
	check.
This commit is contained in:
Sven Neumann
2005-10-20 10:44:22 +00:00
committed by Sven Neumann
parent 2a57394375
commit a5e35eabcd
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2005-10-20 Sven Neumann <sven@gimp.org>
* app/batch.c (batch_run): always call the batch interpreter in
NON-INTERACTIVE mode (see bug #167964).
* plug-ins/script-fu/script-fu-text-console.c: removed the run-mode
check.
2005-10-20 Sven Neumann <sven@gimp.org> 2005-10-20 Sven Neumann <sven@gimp.org>
* plug-ins/helpbrowser/dialog.c (title_changed): replace newlines * plug-ins/helpbrowser/dialog.c (title_changed): replace newlines

2
app/batch.c
View File

@ -79,7 +79,7 @@ batch_run (Gimp *gimp,
ProcRecord *proc = procedural_db_lookup (gimp, proc_name); ProcRecord *proc = procedural_db_lookup (gimp, proc_name);
if (proc) if (proc)
batch_run_cmd (gimp, proc_name, proc, GIMP_RUN_INTERACTIVE, NULL); batch_run_cmd (gimp, proc_name, proc, GIMP_RUN_NONINTERACTIVE, NULL);
else else
g_message (_("The batch interpreter '%s' is not available. " g_message (_("The batch interpreter '%s' is not available. "
"Batch mode disabled."), proc_name); "Batch mode disabled."), proc_name);

31
plug-ins/script-fu/script-fu-text-console.c
View File

@ -43,36 +43,15 @@ script_fu_text_console_run (const gchar *name,
GimpParam **return_vals) GimpParam **return_vals)
{ {
static GimpParam values[1]; static GimpParam values[1];
GimpPDBStatusType status = GIMP_PDB_SUCCESS;
GimpRunMode run_mode;
run_mode = params[0].data.d_int32; siod_set_output_file (stdout);
siod_set_verbose_level (2);
siod_print_welcome ();
switch (run_mode) script_fu_text_console_interface ();
{
case GIMP_RUN_INTERACTIVE:
/* Enable SIOD output */
siod_set_output_file (stdout);
siod_set_verbose_level (2);
siod_print_welcome ();
/* Run the interface */
script_fu_text_console_interface ();
break;
case GIMP_RUN_WITH_LAST_VALS:
case GIMP_RUN_NONINTERACTIVE:
status = GIMP_PDB_CALLING_ERROR;
g_message (_("Script-Fu console mode allows only interactive invocation"));
break;
default:
break;
}
values[0].type = GIMP_PDB_STATUS; values[0].type = GIMP_PDB_STATUS;
values[0].data.d_status = status; values[0].data.d_status = GIMP_PDB_SUCCESS;
*nreturn_vals = 1; *nreturn_vals = 1;
*return_vals = values; *return_vals = values;