Download as
Browse Code »

Commit 60bc0bfa3f0369b52dd89636c57193a369a95089

Authored by Perry Werneck
1 parent e80e008a
Exists in master and in 1 other branch develop

Updating linux IPC module.

Showing 4 changed files with 59 additions and 5 deletions   Show diff stats
server/pw3270-plugin-ipc.cbp
  Diff comments   View file @60bc0bf
... ... @@ -58,6 +58,8 @@
58 58 <Linker>
59 59 <Add option="`pkg-config --libs gtk+-3.0 lib3270 v3270 gio-2.0 dbus-1 dbus-glib-1`" />
60 60 </Linker>
  61 + <Unit filename="../common/src/include/lib3270/ipc-glib.h" />
  62 + <Unit filename="../common/src/include/lib3270/ipc.h" />
61 63 <Unit filename="src/core/constants.c">
62 64 <Option compilerVar="CC" />
63 65 </Unit>
... ... @@ -105,9 +107,7 @@
105 107 <Unit filename="src/core/windows/stop.c">
106 108 <Option compilerVar="CC" />
107 109 </Unit>
108   - <Unit filename="src/include/config.h" />
109 110 <Unit filename="src/include/config.h.in" />
110   - <Unit filename="src/include/lib3270/ipc-glib.h" />
111 111 <Unit filename="src/plugin/plugin.c">
112 112 <Option compilerVar="CC" />
113 113 </Unit>
... ...
server/src/core/convert.c
  Diff comments   View file @60bc0bf
... ... @@ -49,11 +49,11 @@ GVariant * ipc3270_GVariant_from_input_string(GObject *object, char *string, GEr
49 49 if(string) {
50 50 g_autofree gchar * utfstring = ipc3270_convert_input_string(object,string,error);
51 51 lib3270_free(string);
52   - return g_variant_new("(s)", utfstring);
  52 + return g_variant_new_string(utfstring);
53 53 }
54 54  
55 55 ipc3270_set_error(object,errno,error);
56   - return g_variant_new("(s)", "");
  56 + return g_variant_new_string("");
57 57 }
58 58  
59 59  
... ...
server/src/core/linux/start.c
  Diff comments   View file @60bc0bf
... ... @@ -64,7 +64,11 @@ static void
64 64  
65 65 } else if(rc) {
66 66  
67   - g_dbus_method_invocation_return_value(invocation, rc);
  67 + // Convert rc to tuple.
  68 + // 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.
  69 + // Even if the method has a single out-parameter, it must be contained in a tuple.
  70 +
  71 + g_dbus_method_invocation_return_value(invocation, g_variant_new_tuple(&rc,1));
68 72  
69 73 } else {
70 74  
... ...
server/valgrind.suppression
  Diff comments   View file @60bc0bf
... ... @@ -48,3 +48,53 @@
48 48 fun:g_application_register
49 49 }
50 50  
  51 +{
  52 + glib_dl_init
  53 + Memcheck:Leak
  54 + ...
  55 + fun:_dl_init
  56 +}
  57 +
  58 +{
  59 + pango_itemize_with_base_dir
  60 + Memcheck:Leak
  61 + ...
  62 + fun:pango_itemize_with_base_dir
  63 +}
  64 +
  65 +{
  66 + pango_FcDefaultSubstitute
  67 + Memcheck:Leak
  68 + ...
  69 + fun:FcDefaultSubstitute
  70 +}
  71 +
  72 +{
  73 + font_config_parse
  74 + Memcheck:Leak
  75 + ...
  76 + fun:FcConfigParseAndLoad
  77 +}
  78 +
  79 +{
  80 + g_type_register_static
  81 + Memcheck:Leak
  82 + ...
  83 + fun:g_type_register_static
  84 +}
  85 +
  86 +{
  87 + glib_g_task_run_in_thread
  88 + Memcheck:Leak
  89 + ...
  90 + fun:g_task_run_in_thread
  91 +}
  92 +
  93 +{
  94 + gio_g_bus_get_sync
  95 + Memcheck:Leak
  96 + ...
  97 + fun:g_bus_get_sync
  98 +}
  99 +
  100 +
... ...