Updated with upstream update
This commit is contained in:
@ -100,8 +100,8 @@ static void script_fu_command_to_history (ConsoleInterface *console,
|
||||
*/
|
||||
|
||||
PikaValueArray *
|
||||
script_fu_console_run (PikaProcedure *procedure,
|
||||
const PikaValueArray *args)
|
||||
script_fu_console_run (PikaProcedure *procedure,
|
||||
PikaProcedureConfig *config)
|
||||
{
|
||||
ConsoleInterface console = { 0, };
|
||||
GtkWidget *vbox;
|
||||
@ -109,8 +109,6 @@ script_fu_console_run (PikaProcedure *procedure,
|
||||
GtkWidget *scrolled_window;
|
||||
GtkWidget *hbox;
|
||||
|
||||
PikaProcedureConfig *config;
|
||||
|
||||
script_fu_set_print_flag (1);
|
||||
|
||||
pika_ui_init ("script-fu");
|
||||
@ -120,10 +118,6 @@ script_fu_console_run (PikaProcedure *procedure,
|
||||
console_history_init (&console.history);
|
||||
console_total_append_welcome (console.total_history);
|
||||
|
||||
/* Get previous or default settings into config. */
|
||||
config = pika_procedure_create_config (procedure);
|
||||
pika_procedure_config_begin_run (config, NULL, PIKA_RUN_INTERACTIVE, args);
|
||||
|
||||
script_fu_models_from_settings (&console, config);
|
||||
|
||||
console.dialog = pika_dialog_new (_("Script Console"),
|
||||
@ -221,8 +215,6 @@ script_fu_console_run (PikaProcedure *procedure,
|
||||
|
||||
/* Update config with user's change to history */
|
||||
console_history_to_settings (&console.history, config);
|
||||
/* Persist config */
|
||||
pika_procedure_config_end_run (config, PIKA_PDB_SUCCESS);
|
||||
|
||||
return pika_procedure_new_return_values (procedure, PIKA_PDB_SUCCESS, NULL);
|
||||
}
|
||||
@ -643,4 +635,4 @@ script_fu_command_to_history (ConsoleInterface *console,
|
||||
console_total_append_command (console->total_history, command);
|
||||
|
||||
/* Ensure there is a new tail. */
|
||||
}
|
||||
}
|
||||
|
@ -24,7 +24,7 @@
|
||||
|
||||
|
||||
PikaValueArray * script_fu_console_run (PikaProcedure *procedure,
|
||||
const PikaValueArray *args);
|
||||
PikaProcedureConfig *config);
|
||||
|
||||
|
||||
#endif /* __SCRIPT_FU_CONSOLE_H__ */
|
||||
|
Reference in New Issue
Block a user