diff options
Diffstat (limited to 'codegen/valagdbusservermodule.vala')
| -rw-r--r-- | codegen/valagdbusservermodule.vala | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/codegen/valagdbusservermodule.vala b/codegen/valagdbusservermodule.vala index e6f379c9f..6e026b43b 100644 --- a/codegen/valagdbusservermodule.vala +++ b/codegen/valagdbusservermodule.vala @@ -176,15 +176,11 @@ public class Vala.GDBusServerModule : GDBusClientModule { ccode.open_if (new CCodeIdentifier ("error")); - var return_error = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_return_gerror")); + var return_error = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_take_error")); return_error.add_argument (new CCodeIdentifier ("invocation")); return_error.add_argument (new CCodeIdentifier ("error")); ccode.add_expression (return_error); - var free_error = new CCodeFunctionCall (new CCodeIdentifier ("g_error_free")); - free_error.add_argument (new CCodeIdentifier ("error")); - ccode.add_expression (free_error); - if (need_goto_label || requires_destroy (owned_type)) { ccode.add_goto ("_error"); need_goto_label = true; @@ -291,15 +287,11 @@ public class Vala.GDBusServerModule : GDBusClientModule { if (m.tree_can_fail) { ccode.open_if (new CCodeIdentifier ("error")); - var return_error = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_return_gerror")); + var return_error = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_take_error")); return_error.add_argument (new CCodeIdentifier ("invocation")); return_error.add_argument (new CCodeIdentifier ("error")); ccode.add_expression (return_error); - var free_error = new CCodeFunctionCall (new CCodeIdentifier ("g_error_free")); - free_error.add_argument (new CCodeIdentifier ("error")); - ccode.add_expression (free_error); - if (need_goto_label) { ccode.add_goto ("_error"); } else { |