AlderconeStudio/PIKApp
0
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Updated with upstream update

Browse Source
This commit is contained in:
Cassowary
2023-10-30 15:55:30 -07:00
parent 098531073c
commit 3bbdd873ef
584 changed files with 91827 additions and 70362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plug-ins/script-fu/server/script-fu-server-plugin.c
View File

@ -44,7 +44,7 @@ static PikaProcedure * script_fu_server_create_procedure (PikaPlugIn
const gchar *name);
static PikaValueArray * script_fu_server_outer_run (PikaProcedure *procedure,
const PikaValueArray *args,
PikaProcedureConfig *config,
gpointer run_data);
static void script_fu_server_run_init (PikaProcedure *procedure,
PikaRunMode run_mode);
@ -188,15 +188,14 @@ script_fu_server_create_procedure (PikaPlugIn *plug_in,
*/
static PikaValueArray *
script_fu_server_outer_run (PikaProcedure *procedure,
const PikaValueArray *args,
PikaProcedureConfig *config,
gpointer run_data)
{
PikaValueArray *return_vals = NULL;
PikaRunMode run_mode = PIKA_RUN_NONINTERACTIVE;
if (pika_value_array_length (args) > 0)
script_fu_server_run_init (procedure, PIKA_VALUES_GET_ENUM (args, 0));
else
script_fu_server_run_init (procedure, PIKA_RUN_NONINTERACTIVE);
g_object_get (config, "run-mode", &run_mode, NULL);
script_fu_server_run_init (procedure, run_mode);
/* Remind any users watching the console. */
g_debug ("Starting. Further logging by server might be to a log file.");
@ -205,7 +204,7 @@ script_fu_server_outer_run (PikaProcedure *procedure,
* Call the inner run func, defined in script-fu-server.c
* !!! This does not return unless a client evals "(pika-quit)"
*/
return_vals = script_fu_server_run (procedure, args);
return_vals = script_fu_server_run (procedure, config);
/*
* The server returns SUCCESS but no other values (to the caller)

18
plug-ins/script-fu/server/script-fu-server.c
View File

@ -275,18 +275,20 @@ script_fu_server_post_command (void)
PikaValueArray *
script_fu_server_run (PikaProcedure *procedure,
const PikaValueArray *args)
PikaProcedureConfig *config)
{
PikaPDBStatusType status = PIKA_PDB_SUCCESS;
PikaRunMode run_mode;
const gchar *ip;
gchar *ip;
gint port;
const gchar *logfile;
gchar *logfile;
run_mode = PIKA_VALUES_GET_ENUM (args, 0);
ip = PIKA_VALUES_GET_STRING (args, 1);
port = PIKA_VALUES_GET_INT (args, 2);
logfile = PIKA_VALUES_GET_STRING (args, 3);
g_object_get (config,
"run-mode", &run_mode,
"ip", &ip,
"port", &port,
"logfile", &logfile,
NULL);
script_fu_set_run_mode (run_mode);
script_fu_set_print_flag (1);
@ -316,6 +318,8 @@ script_fu_server_run (PikaProcedure *procedure,
default:
break;
}
g_free (ip);
g_free (logfile);
return pika_procedure_new_return_values (procedure, status, NULL);
}

2
plug-ins/script-fu/server/script-fu-server.h
View File

@ -24,7 +24,7 @@
PikaValueArray * script_fu_server_run (PikaProcedure *procedure,
const PikaValueArray *args);
PikaProcedureConfig *config);
#endif /* __SCRIPT_FU_SERVER__ */