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

ScriptFu: fix 11077: call gimp_ui_init in every run_func

Browse Source 
More descriptive name for script-fu-interface-dialog

Delete SF flag for gimp_ui_init already called: gimp_ui_init can be called often.

FUTURE: might be faster to call just gegl_init when mode is non-interactive.
This commit is contained in:
bootchk
2024-03-20 05:18:11 -04:00
committed by Lloyd Konneker
parent fc310e0bed
commit 59b6c8fc8f
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plug-ins/script-fu/libscriptfu/script-fu-interface.c
View File

@ -163,7 +163,7 @@ script_fu_interface_report_cc (const gchar *command)
}
GimpPDBStatusType
script_fu_interface (SFScript *script,
script_fu_interface_dialog (SFScript *script,
gint start_arg)
{
GtkWidget *dialog;
@ -174,7 +174,7 @@ script_fu_interface (SFScript *script,
gchar *title;
gint i;
static gboolean gtk_initted = FALSE;
/* Requires gimp_ui_init called previously. */
g_debug ("%s", G_STRFUNC);
@ -198,13 +198,6 @@ script_fu_interface (SFScript *script,
g_return_val_if_fail (script != NULL, FALSE);
if (!gtk_initted)
{
gimp_ui_init ("script-fu");
gtk_initted = TRUE;
}
sf_status = GIMP_PDB_SUCCESS;
sf_interface = g_slice_new0 (SFInterface);

2
plug-ins/script-fu/libscriptfu/script-fu-interface.h
View File

@ -19,7 +19,7 @@
#define __SCRIPT_FU_INTERFACE_H__
GimpPDBStatusType script_fu_interface (SFScript *script,
GimpPDBStatusType script_fu_interface_dialog (SFScript *script,
gint start_arg);
void script_fu_interface_report_cc (const gchar *command);
gboolean script_fu_interface_is_active (void);

9
plug-ins/script-fu/libscriptfu/script-fu-run-func.c
View File

@ -21,6 +21,7 @@
#include <glib.h>
#include <libgimp/gimp.h>
#include <libgimp/gimpui.h>
#include "scheme-wrapper.h" /* type "pointer" */
@ -79,6 +80,9 @@ script_fu_run_image_procedure (GimpProcedure *procedure, /* GimpImageProc
ts_set_run_mode (run_mode);
/* Need Gegl. Also inits ui, needed when mode is interactive. */
gimp_ui_init ("script-fu");
begin_interpret_default_dialect ();
switch (run_mode)
@ -162,6 +166,9 @@ script_fu_run_procedure (GimpProcedure *procedure,
ts_set_run_mode (run_mode);
/* Need Gegl. Also inits ui, needed when mode is interactive. */
gimp_ui_init ("script-fu");
begin_interpret_default_dialect ();
switch (run_mode)
@ -176,7 +183,7 @@ script_fu_run_procedure (GimpProcedure *procedure,
/* ...then acquire the rest of arguments (if any) with a dialog */
if (script->n_args > min_args)
{
status = script_fu_interface (script, min_args);
status = script_fu_interface_dialog (script, min_args);
break;
}
/* otherwise (if the script takes no more arguments), skip