From 9c1683a357634035b4eef38e3ea8e6728c90a85f Mon Sep 17 00:00:00 2001 From: Giovanni panozzo Date: Thu, 21 May 2020 14:28:56 +0200 Subject: Introduce remmina_plugin_debug() for plugins --- plugins/exec/exec_plugin.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'plugins/exec') diff --git a/plugins/exec/exec_plugin.c b/plugins/exec/exec_plugin.c index 71d5ecef0..04b1532f2 100644 --- a/plugins/exec/exec_plugin.c +++ b/plugins/exec/exec_plugin.c @@ -56,6 +56,8 @@ typedef struct _RemminaPluginExecData { } RemminaPluginExecData; static RemminaPluginService *remmina_plugin_service = NULL; +#define remmina_plugin_debug(fmt, ...) remmina_plugin_service->_remmina_debug(__func__, fmt __VA_OPT__(,) __VA_ARGS__) + static void cb_child_watch( GPid pid, gint status) @@ -111,7 +113,7 @@ static void remmina_plugin_exec_init(RemminaProtocolWidget *gp) TRACE_CALL(__func__); RemminaPluginExecData *gpdata; - remmina_plugin_service->_debug("[%s] Plugin init", PLUGIN_NAME); + remmina_plugin_debug("[%s] Plugin init", PLUGIN_NAME); gpdata = g_new0(RemminaPluginExecData, 1); g_object_set_data_full(G_OBJECT(gp), "plugin-data", gpdata, g_free); @@ -148,7 +150,7 @@ static gboolean remmina_plugin_exec_run(RemminaProtocolWidget *gp) GtkDialog *dialog; GIOChannel *out_ch, *err_ch; - remmina_plugin_service->_debug("[%s] Plugin run", PLUGIN_NAME); + remmina_plugin_debug("[%s] Plugin run", PLUGIN_NAME); RemminaPluginExecData *gpdata = GET_PLUGIN_DATA(gp); remminafile = remmina_plugin_service->protocol_plugin_get_file(gp); @@ -169,7 +171,7 @@ static gboolean remmina_plugin_exec_run(RemminaProtocolWidget *gp) } if (remmina_plugin_service->file_get_int(remminafile, "runasync", FALSE)) { - remmina_plugin_service->_debug("[%s] Run Async", PLUGIN_NAME); + remmina_plugin_debug("[%s] Run Async", PLUGIN_NAME); g_spawn_async_with_pipes( NULL, argv, NULL, @@ -214,7 +216,7 @@ static gboolean remmina_plugin_exec_run(RemminaProtocolWidget *gp) break; } gtk_widget_destroy(GTK_WIDGET(dialog)); - remmina_plugin_service->_debug("[%s] Run Sync", PLUGIN_NAME); + remmina_plugin_debug("[%s] Run Sync", PLUGIN_NAME); g_spawn_sync (NULL, // CWD or NULL argv, NULL, // ENVP or NULL @@ -227,7 +229,7 @@ static gboolean remmina_plugin_exec_run(RemminaProtocolWidget *gp) NULL, // Exit status &error); if (!error) { - remmina_plugin_service->_debug("[%s] Command executed", PLUGIN_NAME); + remmina_plugin_debug("[%s] Command executed", PLUGIN_NAME); gtk_text_buffer_set_text (gpdata->log_buffer, stdout_buffer, -1); }else { g_warning("Command %s exited with error: %s\n", cmd, error->message); @@ -245,7 +247,7 @@ static gboolean remmina_plugin_exec_run(RemminaProtocolWidget *gp) static gboolean remmina_plugin_exec_close(RemminaProtocolWidget *gp) { TRACE_CALL(__func__); - remmina_plugin_service->_debug("[%s] Plugin close", PLUGIN_NAME); + remmina_plugin_debug("[%s] Plugin close", PLUGIN_NAME); remmina_plugin_service->protocol_plugin_signal_connection_closed(gp); return FALSE; } -- cgit v1.2.3