diff --git a/server/pw3270-plugin-ipc.cbp b/server/pw3270-plugin-ipc.cbp index 0561ef8..f3de793 100644 --- a/server/pw3270-plugin-ipc.cbp +++ b/server/pw3270-plugin-ipc.cbp @@ -58,6 +58,8 @@ + + @@ -105,9 +107,7 @@ - - diff --git a/server/src/core/convert.c b/server/src/core/convert.c index 41da8df..4b6fe8b 100644 --- a/server/src/core/convert.c +++ b/server/src/core/convert.c @@ -49,11 +49,11 @@ GVariant * ipc3270_GVariant_from_input_string(GObject *object, char *string, GEr if(string) { g_autofree gchar * utfstring = ipc3270_convert_input_string(object,string,error); lib3270_free(string); - return g_variant_new("(s)", utfstring); + return g_variant_new_string(utfstring); } ipc3270_set_error(object,errno,error); - return g_variant_new("(s)", ""); + return g_variant_new_string(""); } diff --git a/server/src/core/linux/start.c b/server/src/core/linux/start.c index 3244033..d4a2917 100644 --- a/server/src/core/linux/start.c +++ b/server/src/core/linux/start.c @@ -64,7 +64,11 @@ static void } else if(rc) { - g_dbus_method_invocation_return_value(invocation, rc); + // Convert rc to tuple. + // It is an error if parameters is not of the right format: it must be a tuple containing the out-parameters of the D-Bus method. + // Even if the method has a single out-parameter, it must be contained in a tuple. + + g_dbus_method_invocation_return_value(invocation, g_variant_new_tuple(&rc,1)); } else { diff --git a/server/valgrind.suppression b/server/valgrind.suppression index 5166912..2e4d6aa 100644 --- a/server/valgrind.suppression +++ b/server/valgrind.suppression @@ -48,3 +48,53 @@ fun:g_application_register } +{ + glib_dl_init + Memcheck:Leak + ... + fun:_dl_init +} + +{ + pango_itemize_with_base_dir + Memcheck:Leak + ... + fun:pango_itemize_with_base_dir +} + +{ + pango_FcDefaultSubstitute + Memcheck:Leak + ... + fun:FcDefaultSubstitute +} + +{ + font_config_parse + Memcheck:Leak + ... + fun:FcConfigParseAndLoad +} + +{ + g_type_register_static + Memcheck:Leak + ... + fun:g_type_register_static +} + +{ + glib_g_task_run_in_thread + Memcheck:Leak + ... + fun:g_task_run_in_thread +} + +{ + gio_g_bus_get_sync + Memcheck:Leak + ... + fun:g_bus_get_sync +} + + -- libgit2 0.21.2