void generate_marshalling (Method m, CallType call_type, string? iface_name, string? method_name, int method_timeout) {
var gdbusproxy = new CCodeCastExpression (new CCodeIdentifier ("self"), "GDBusProxy *");
- var connection = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_proxy_get_connection"));
- connection.add_argument (gdbusproxy);
-
bool uses_fd = dbus_method_uses_file_descriptor (m);
if (uses_fd) {
cfile.add_include ("gio/gunixfdlist.h");
ccode.add_declaration ("GUnixFDList*", new CCodeVariableDeclarator ("_fd_list"));
+ if (call_type == CallType.SYNC || call_type == CallType.FINISH) {
+ ccode.add_declaration ("GUnixFDList*", new CCodeVariableDeclarator ("_out_fd_list"));
+ }
+ }
+
+ if (call_type == CallType.SYNC || call_type == CallType.FINISH) {
+ ccode.add_declaration ("GVariant", new CCodeVariableDeclarator ("*_reply"));
}
bool has_error_argument = m.tree_can_fail;
error_argument = new CCodeConstant ("NULL");
}
- if (call_type != CallType.FINISH) {
- var destination = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_proxy_get_name"));
- destination.add_argument (gdbusproxy);
-
- var interface_name = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_proxy_get_interface_name"));
- interface_name.add_argument (gdbusproxy);
-
- var object_path = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_proxy_get_object_path"));
- object_path.add_argument (gdbusproxy);
-
- CCodeExpression timeout;
- if (method_timeout <= 0) {
- timeout = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_proxy_get_default_timeout"));
- ((CCodeFunctionCall) timeout).add_argument (gdbusproxy);
- } else {
- timeout = new CCodeConstant ("%d".printf (method_timeout));
- }
+ CCodeFunctionCall ccall = new CCodeFunctionCall ();
+ ccall.add_argument (gdbusproxy);
+ if (call_type != CallType.FINISH) {
// register errors
var error_types = new ArrayList<DataType> ();
m.get_error_types (error_types);
foreach (var error_type in error_types) {
var errtype = (ErrorType) error_type;
if (errtype.error_domain != null) {
+ var domain_name = errtype.error_domain.get_full_name ();
+ if (domain_name == "GLib.IOError" || domain_name == "GLib.DBusError") {
+ // Don't bother.
+ continue;
+ }
ccode.add_expression (new CCodeIdentifier (get_ccode_upper_case_name (errtype.error_domain)));
}
}
- // build D-Bus message
-
- ccode.add_declaration ("GDBusMessage", new CCodeVariableDeclarator ("*_message"));
-
- var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_new_method_call"));
- ccall.add_argument (destination);
- ccall.add_argument (object_path);
- if (iface_name != null) {
- ccall.add_argument (new CCodeConstant ("\"%s\"".printf (iface_name)));
- } else {
- ccall.add_argument (interface_name);
- }
ccall.add_argument (new CCodeConstant ("\"%s\"".printf (method_name)));
- ccode.add_assignment (new CCodeIdentifier ("_message"), ccall);
- ccode.add_declaration ("GVariant", new CCodeVariableDeclarator ("*_arguments"));
ccode.add_declaration ("GVariantBuilder", new CCodeVariableDeclarator ("_arguments_builder"));
var builder_init = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_builder_init"));
var builder_end = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_builder_end"));
builder_end.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_arguments_builder")));
- ccode.add_assignment (new CCodeIdentifier ("_arguments"), builder_end);
-
- var set_body = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_set_body"));
- set_body.add_argument (new CCodeIdentifier ("_message"));
- set_body.add_argument (new CCodeIdentifier ("_arguments"));
- ccode.add_expression (set_body);
+ ccall.add_argument (builder_end);
+ ccall.add_argument (new CCodeConstant ("G_DBUS_CALL_FLAGS_NONE"));
+ ccall.add_argument (new CCodeConstant ("%d".printf (method_timeout)));
if (uses_fd) {
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_set_unix_fd_list"));
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccall.add_argument (new CCodeIdentifier ("_fd_list"));
- ccode.add_expression (ccall);
-
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
ccall.add_argument (new CCodeIdentifier ("_fd_list"));
- ccode.add_expression (ccall);
+ if (call_type == CallType.SYNC) {
+ ccall.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_out_fd_list")));
+ }
}
- // send D-Bus message
+ ccall.add_argument (cancellable);
if (call_type == CallType.SYNC) {
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_connection_send_message_with_reply_sync"));
- ccall.add_argument (connection);
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccall.add_argument (new CCodeConstant ("G_DBUS_SEND_MESSAGE_FLAGS_NONE"));
- ccall.add_argument (timeout);
- ccall.add_argument (new CCodeConstant ("NULL"));
- ccall.add_argument (cancellable);
+ ccall.call = new CCodeIdentifier (uses_fd ? "g_dbus_proxy_call_with_unix_fd_list_sync" : "g_dbus_proxy_call_sync");
ccall.add_argument (error_argument);
- ccode.add_assignment (new CCodeIdentifier ("_reply_message"), ccall);
+ ccode.add_assignment (new CCodeIdentifier ("_reply"), ccall);
} else if (call_type == CallType.NO_REPLY) {
- var set_flags = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_set_flags"));
- set_flags.add_argument (new CCodeIdentifier ("_message"));
- set_flags.add_argument (new CCodeConstant ("G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED"));
- ccode.add_expression (set_flags);
-
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_connection_send_message"));
- ccall.add_argument (connection);
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccall.add_argument (new CCodeConstant ("G_DBUS_SEND_MESSAGE_FLAGS_NONE"));
+ ccall.call = new CCodeIdentifier (uses_fd ? "g_dbus_proxy_call_with_unix_fd_list" : "g_dbus_proxy_call");
+ ccall.add_argument (new CCodeConstant ("NULL"));
ccall.add_argument (new CCodeConstant ("NULL"));
- ccall.add_argument (error_argument);
ccode.add_expression (ccall);
} else if (call_type == CallType.ASYNC) {
- var callback_specified = new CCodeBinaryExpression (CCodeBinaryOperator.INEQUALITY, new CCodeIdentifier ("_callback_"), new CCodeConstant ("NULL"));
- ccode.open_if (callback_specified);
-
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_connection_send_message_with_reply"));
- ccall.add_argument (connection);
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccall.add_argument (new CCodeConstant ("G_DBUS_SEND_MESSAGE_FLAGS_NONE"));
- ccall.add_argument (timeout);
- ccall.add_argument (new CCodeConstant ("NULL"));
- ccall.add_argument (cancellable);
-
- CCodeFunctionCall res_wrapper = null;
-
- // use wrapper as source_object wouldn't be correct otherwise
- ccall.add_argument (new CCodeIdentifier (generate_async_callback_wrapper ()));
- res_wrapper = new CCodeFunctionCall (new CCodeIdentifier ("g_task_new"));
- res_wrapper.add_argument (new CCodeCastExpression (new CCodeIdentifier ("self"), "GObject *"));
- res_wrapper.add_argument (new CCodeConstant ("NULL"));
- res_wrapper.add_argument (new CCodeIdentifier ("_callback_"));
- res_wrapper.add_argument (new CCodeIdentifier ("_user_data_"));
- ccall.add_argument (res_wrapper);
-
+ ccall.call = new CCodeIdentifier (uses_fd ? "g_dbus_proxy_call_with_unix_fd_list" : "g_dbus_proxy_call");
+ ccall.add_argument (new CCodeIdentifier ("_callback_"));
+ ccall.add_argument (new CCodeIdentifier ("_user_data_"));
ccode.add_expression (ccall);
+ }
- ccode.add_else ();
-
- var set_flags = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_set_flags"));
- set_flags.add_argument (new CCodeIdentifier ("_message"));
- set_flags.add_argument (new CCodeConstant ("G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED"));
- ccode.add_expression (set_flags);
-
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_connection_send_message"));
- ccall.add_argument (connection);
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccall.add_argument (new CCodeConstant ("G_DBUS_SEND_MESSAGE_FLAGS_NONE"));
- ccall.add_argument (new CCodeConstant ("NULL"));
- ccall.add_argument (new CCodeConstant ("NULL"));
+ if (uses_fd) {
+ ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
+ ccall.add_argument (new CCodeIdentifier ("_fd_list"));
ccode.add_expression (ccall);
-
- ccode.close ();
}
-
- // free D-Bus message
-
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
- ccall.add_argument (new CCodeIdentifier ("_message"));
- ccode.add_expression (ccall);
+ if (call_type == CallType.NO_REPLY || call_type == CallType.ASYNC) {
+ return;
+ }
} else {
- var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_connection_send_message_with_reply_finish"));
- ccall.add_argument (connection);
-
- // unwrap async result
- ccode.add_declaration ("GAsyncResult", new CCodeVariableDeclarator ("*_inner_res"));
-
- var inner_res = new CCodeFunctionCall (new CCodeIdentifier ("g_task_propagate_pointer"));
- inner_res.add_argument (new CCodeCastExpression (new CCodeIdentifier ("_res_"), "GTask *"));
- inner_res.add_argument (new CCodeConstant ("NULL"));
- ccode.add_assignment (new CCodeIdentifier ("_inner_res"), inner_res);
-
- ccall.add_argument (new CCodeIdentifier ("_inner_res"));
+ ccall.call = new CCodeIdentifier (uses_fd ? "g_dbus_proxy_call_with_unix_fd_list_finish" : "g_dbus_proxy_call_finish");
+ if (uses_fd) {
+ ccall.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_out_fd_list")));
+ }
+ ccall.add_argument (new CCodeIdentifier ("_res_"));
ccall.add_argument (error_argument);
- ccode.add_assignment (new CCodeIdentifier ("_reply_message"), ccall);
- // _inner_res is guaranteed to be non-NULL, so just unref it
- var unref_inner_res = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
- unref_inner_res.add_argument (new CCodeIdentifier ("_inner_res"));
- ccode.add_expression (unref_inner_res);
+ ccode.add_assignment (new CCodeIdentifier ("_reply"), ccall);
}
- if (call_type == CallType.SYNC || call_type == CallType.FINISH) {
- ccode.add_declaration ("GDBusMessage", new CCodeVariableDeclarator ("*_reply_message"));
-
- var unref_reply = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
- unref_reply.add_argument (new CCodeIdentifier ("_reply_message"));
+ // Return on errors.
+ var reply_is_null = new CCodeUnaryExpression (CCodeUnaryOperator.LOGICAL_NEGATION, new CCodeIdentifier ("_reply"));
+ ccode.open_if (reply_is_null);
+ return_default_value (m.return_type, true);
+ ccode.close ();
- // return on io error
- var reply_is_null = new CCodeUnaryExpression (CCodeUnaryOperator.LOGICAL_NEGATION, new CCodeIdentifier ("_reply_message"));
- ccode.open_if (reply_is_null);
- return_default_value (m.return_type);
- ccode.close ();
+ bool has_result = !(m.return_type is VoidType);
- // return on remote error
- var ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_to_gerror"));
- ccall.add_argument (new CCodeIdentifier ("_reply_message"));
- ccall.add_argument (error_argument);
- ccode.open_if (ccall);
- ccode.add_expression (unref_reply);
- return_default_value (m.return_type);
- ccode.close ();
+ foreach (Parameter param in m.get_parameters ()) {
+ if (param.direction == ParameterDirection.OUT) {
+ has_result = true;
+ }
+ }
- bool has_result = !(m.return_type is VoidType);
+ var unref_reply = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_unref"));
+ unref_reply.add_argument (new CCodeIdentifier ("_reply"));
+ CCodeStatement? unref_out_fd_list = null;
+ if (uses_fd) {
+ ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_object_unref"));
+ ccall.add_argument (new CCodeIdentifier ("_out_fd_list"));
+ var cblock = new CCodeBlock ();
+ cblock.add_statement (new CCodeExpressionStatement (ccall));
+ unref_out_fd_list = new CCodeIfStatement (new CCodeIdentifier ("_out_fd_list"), cblock);
+ }
+ if (!has_result) {
+ ccode.add_expression (unref_reply);
if (uses_fd) {
- ccode.add_declaration ("gint", new CCodeVariableDeclarator.zero ("_fd_index", new CCodeConstant ("0")));
- ccode.add_declaration ("gint", new CCodeVariableDeclarator ("_fd"));
- }
-
- foreach (Parameter param in m.get_parameters ()) {
- if (param.direction == ParameterDirection.OUT) {
- has_result = true;
- }
+ ccode.add_statement ((!) unref_out_fd_list);
}
+ return;
+ }
- if (has_result) {
- ccode.add_declaration ("GVariant", new CCodeVariableDeclarator ("*_reply"));
- ccode.add_declaration ("GVariantIter", new CCodeVariableDeclarator ("_reply_iter"));
+ if (uses_fd) {
+ ccode.add_declaration ("gint", new CCodeVariableDeclarator.zero ("_fd_index", new CCodeConstant ("0")));
+ ccode.add_declaration ("gint", new CCodeVariableDeclarator ("_fd"));
+ }
+ ccode.add_declaration ("GVariantIter", new CCodeVariableDeclarator ("_reply_iter"));
- ccall = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_get_body"));
- ccall.add_argument (new CCodeIdentifier ("_reply_message"));
- ccode.add_assignment (new CCodeIdentifier ("_reply"), ccall);
+ var iter_init = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_iter_init"));
+ iter_init.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_reply_iter")));
+ iter_init.add_argument (new CCodeIdentifier ("_reply"));
+ ccode.add_expression (iter_init);
- var iter_init = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_iter_init"));
- iter_init.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("_reply_iter")));
- iter_init.add_argument (new CCodeIdentifier ("_reply"));
- ccode.add_expression (iter_init);
+ foreach (Parameter param in m.get_parameters ()) {
+ if (param.direction == ParameterDirection.OUT) {
+ ccode.add_declaration (get_ccode_name (param.variable_type), new CCodeVariableDeclarator.zero ("_vala_%s".printf (param.name), default_value_for_type (param.variable_type, true)));
- foreach (Parameter param in m.get_parameters ()) {
- if (param.direction == ParameterDirection.OUT) {
- ccode.add_declaration (get_ccode_name (param.variable_type), new CCodeVariableDeclarator.zero ("_vala_%s".printf (param.name), default_value_for_type (param.variable_type, true)));
+ var array_type = param.variable_type as ArrayType;
+ if (array_type != null) {
+ var length_ctype = get_ccode_array_length_type (array_type);
+ for (int dim = 1; dim <= array_type.rank; dim++) {
+ ccode.add_declaration (length_ctype, new CCodeVariableDeclarator ("_vala_%s_length%d".printf (param.name, dim), new CCodeConstant ("0")));
+ }
+ }
- var array_type = param.variable_type as ArrayType;
- if (array_type != null) {
- var length_ctype = get_ccode_array_length_type (array_type);
- for (int dim = 1; dim <= array_type.rank; dim++) {
- ccode.add_declaration (length_ctype, new CCodeVariableDeclarator ("_vala_%s_length%d".printf (param.name, dim), new CCodeConstant ("0")));
- }
- }
+ var target = new CCodeIdentifier ("_vala_%s".printf (param.name));
+ bool may_fail;
- var target = new CCodeIdentifier ("_vala_%s".printf (param.name));
- bool may_fail;
+ receive_dbus_value (param.variable_type, new CCodeIdentifier ("_out_fd_list"), new CCodeIdentifier ("_reply_iter"), target, param, error_argument, out may_fail);
- receive_dbus_value (param.variable_type, new CCodeIdentifier ("_reply_message"), new CCodeIdentifier ("_reply_iter"), target, param, error_argument, out may_fail);
+ // TODO check that parameter is not NULL (out parameters are optional)
+ // free value if parameter is NULL
+ ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_variable_cname (param.name))), target);
+ if (array_type != null) {
+ for (int dim = 1; dim <= array_type.rank; dim++) {
// TODO check that parameter is not NULL (out parameters are optional)
- // free value if parameter is NULL
- ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier (get_variable_cname (param.name))), target);
-
- if (array_type != null) {
- for (int dim = 1; dim <= array_type.rank; dim++) {
- // TODO check that parameter is not NULL (out parameters are optional)
- ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("%s_length%d".printf (param.name, dim))), new CCodeIdentifier ("_vala_%s_length%d".printf (param.name, dim)));
- }
- }
-
- if (may_fail && has_error_argument) {
- ccode.open_if (new CCodeBinaryExpression (CCodeBinaryOperator.AND, new CCodeIdentifier ("error"), new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("error"))));
- ccode.add_expression (unref_reply);
- return_default_value (m.return_type);
- ccode.close ();
- }
+ ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("%s_length%d".printf (param.name, dim))), new CCodeIdentifier ("_vala_%s_length%d".printf (param.name, dim)));
}
}
- if (!(m.return_type is VoidType)) {
- if (m.return_type.is_real_non_null_struct_type ()) {
- var target = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("result"));
- receive_dbus_value (m.return_type, new CCodeIdentifier ("_reply_message"), new CCodeIdentifier ("_reply_iter"), target, m);
- } else {
- ccode.add_declaration (get_ccode_name (m.return_type), new CCodeVariableDeclarator.zero ("_result", default_value_for_type (m.return_type, true)));
-
- var array_type = m.return_type as ArrayType;
- if (array_type != null) {
- var length_ctype = get_ccode_array_length_type (array_type);
- for (int dim = 1; dim <= array_type.rank; dim++) {
- ccode.add_declaration (length_ctype, new CCodeVariableDeclarator ("_result_length%d".printf (dim), new CCodeConstant ("0")));
- }
- }
-
- bool may_fail;
- receive_dbus_value (m.return_type, new CCodeIdentifier ("_reply_message"), new CCodeIdentifier ("_reply_iter"), new CCodeIdentifier ("_result"), m, new CCodeIdentifier ("error"), out may_fail);
-
- if (array_type != null) {
- for (int dim = 1; dim <= array_type.rank; dim++) {
- // TODO check that parameter is not NULL (out parameters are optional)
- ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("result_length%d".printf (dim))), new CCodeIdentifier ("_result_length%d".printf (dim)));
- }
- }
-
- if (may_fail) {
- ccode.open_if (new CCodeBinaryExpression (CCodeBinaryOperator.AND, new CCodeIdentifier ("error"), new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("error"))));
- ccode.add_expression (unref_reply);
- return_default_value (m.return_type);
- ccode.close ();
- }
+ if (may_fail && has_error_argument) {
+ ccode.open_if (new CCodeBinaryExpression (CCodeBinaryOperator.AND, new CCodeIdentifier ("error"), new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("error"))));
+ ccode.add_expression (unref_reply);
+ if (uses_fd) {
+ ccode.add_statement ((!) unref_out_fd_list);
}
+ return_default_value (m.return_type, true);
+ ccode.close ();
}
}
+ }
- ccode.add_expression (unref_reply);
+ if (!(m.return_type is VoidType)) {
+ if (m.return_type.is_real_non_null_struct_type ()) {
+ var target = new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("result"));
+ receive_dbus_value (m.return_type, new CCodeIdentifier ("_out_fd_list"), new CCodeIdentifier ("_reply_iter"), target, m);
+ } else {
+ ccode.add_declaration (get_ccode_name (m.return_type), new CCodeVariableDeclarator.zero ("_result", default_value_for_type (m.return_type, true)));
+
+ var array_type = m.return_type as ArrayType;
+ if (array_type != null) {
+ var length_ctype = get_ccode_array_length_type (array_type);
+ for (int dim = 1; dim <= array_type.rank; dim++) {
+ ccode.add_declaration (length_ctype, new CCodeVariableDeclarator ("_result_length%d".printf (dim), new CCodeConstant ("0")));
+ }
+ }
+
+ bool may_fail;
+ receive_dbus_value (m.return_type, new CCodeIdentifier ("_out_fd_list"), new CCodeIdentifier ("_reply_iter"), new CCodeIdentifier ("_result"), m, new CCodeIdentifier ("error"), out may_fail);
- if (!(m.return_type is VoidType || m.return_type.is_real_non_null_struct_type ())) {
- ccode.add_return (new CCodeIdentifier ("_result"));
+ if (array_type != null) {
+ for (int dim = 1; dim <= array_type.rank; dim++) {
+ // TODO check that parameter is not NULL (out parameters are optional)
+ ccode.add_assignment (new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("result_length%d".printf (dim))), new CCodeIdentifier ("_result_length%d".printf (dim)));
+ }
+ }
+ if (may_fail) {
+ ccode.open_if (new CCodeBinaryExpression (CCodeBinaryOperator.AND, new CCodeIdentifier ("error"), new CCodeUnaryExpression (CCodeUnaryOperator.POINTER_INDIRECTION, new CCodeIdentifier ("error"))));
+ ccode.add_expression (unref_reply);
+ if (uses_fd) {
+ ccode.add_statement ((!) unref_out_fd_list);
+ }
+ return_default_value (m.return_type, true);
+ ccode.close ();
+ }
}
}
+
+ ccode.add_expression (unref_reply);
+ if (uses_fd) {
+ ccode.add_statement ((!) unref_out_fd_list);
+ }
+
+ if (!(m.return_type is VoidType || m.return_type.is_real_non_null_struct_type ())) {
+ ccode.add_return (new CCodeIdentifier ("_result"));
+ }
}
string generate_dbus_proxy_method (Interface main_iface, Interface iface, Method m) {
return null;
}
- public void receive_dbus_value (DataType type, CCodeExpression message_expr, CCodeExpression iter_expr, CCodeExpression target_expr, Symbol? sym, CCodeExpression? error_expr = null, out bool may_fail = null) {
- var fd_list = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_get_unix_fd_list"));
- fd_list.add_argument (message_expr);
-
+ public void receive_dbus_value (DataType type, CCodeExpression? fd_list_expr, CCodeExpression iter_expr, CCodeExpression target_expr, Symbol? sym, CCodeExpression? error_expr = null, out bool may_fail = null) {
var fd_var = new CCodeIdentifier ("_fd");
var stream = create_from_file_descriptor (type, fd_var);
if (stream != null) {
- var fd_list_var = new CCodeIdentifier ("_fd_list");
-
var fd = new CCodeFunctionCall (new CCodeIdentifier ("g_unix_fd_list_get"));
- fd.add_argument (fd_list_var);
+ fd.add_argument (fd_list_expr);
fd.add_argument (new CCodeIdentifier ("_fd_index"));
fd.add_argument (error_expr);
- ccode.add_assignment (fd_list_var, fd_list);
- ccode.open_if (fd_list_var);
+ ccode.open_if (fd_list_expr);
var get_fd = new CCodeFunctionCall (new CCodeIdentifier ("g_variant_iter_next"));
get_fd.add_argument (new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, iter_expr));
set_error.add_argument (error_expr);
set_error.add_argument (new CCodeIdentifier ("G_IO_ERROR"));
set_error.add_argument (new CCodeIdentifier ("G_IO_ERROR_FAILED"));
- set_error.add_argument (new CCodeConstant ("\"FD List is NULL\""));
+ set_error.add_argument (new CCodeConstant ("\"No file descriptor returned\""));
ccode.add_expression (set_error);
ccode.close ();
} else {
read_expression (type, iter_expr, target_expr, sym, error_expr, out may_fail);
}
}
+
CCodeExpression get_method_info (ObjectTypeSymbol sym) {
var infos = new CCodeInitializerList ();
var message_expr = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_method_invocation_get_message"));
message_expr.add_argument (new CCodeIdentifier ("invocation"));
+ var fd_list_expr = new CCodeFunctionCall (new CCodeIdentifier ("g_dbus_message_get_unix_fd_list"));
+ fd_list_expr.add_argument (message_expr);
bool may_fail;
- receive_dbus_value (param.variable_type, message_expr, new CCodeIdentifier ("_arguments_iter"), param_expr, param, new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("error")), out may_fail);
+ receive_dbus_value (param.variable_type, fd_list_expr, new CCodeIdentifier ("_arguments_iter"), param_expr, param, new CCodeUnaryExpression (CCodeUnaryOperator.ADDRESS_OF, new CCodeIdentifier ("error")), out may_fail);
if (may_fail) {
if (!uses_error) {
gint* result_length1,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
gint* _tmp0_;
GVariantBuilder _tmp1_;
gint _tmp2_;
- GDBusMessage *_reply_message;
- GVariant *_reply;
GVariantIter _reply_iter;
gint* _vala_j = NULL;
gint _vala_j_length1;
gint _tmp8__length1;
GVariantIter _tmp9_;
GVariant* _tmp10_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestInt");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_tmp0_ = i;
g_variant_builder_init (&_tmp1_, G_VARIANT_TYPE ("ai"));
_tmp0_++;
}
g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp1_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestInt", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_vala_j_length1 = 0;
_tmp3_ = g_variant_iter_next_value (&_reply_iter);
_result = _tmp8_;
g_variant_unref (_tmp7_);
*result_length1 = _result_length1;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gint* result_length1,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
gchar** _tmp11_;
GVariantBuilder _tmp12_;
gint _tmp13_;
- GDBusMessage *_reply_message;
- GVariant *_reply;
GVariantIter _reply_iter;
gchar** _vala_t = NULL;
gint _vala_t_length1;
gint _tmp19__length1;
GVariantIter _tmp20_;
GVariant* _tmp21_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_tmp11_ = s;
g_variant_builder_init (&_tmp12_, G_VARIANT_TYPE ("as"));
_tmp11_++;
}
g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp12_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_vala_t_length1 = 0;
_tmp14_ = g_variant_iter_next_value (&_reply_iter);
_result = _tmp19_;
g_variant_unref (_tmp18_);
*result_length1 = _result_length1;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
test_proxy_get_test (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _result = 0;
- GVariant* _tmp2_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "GetTest");
+ GVariant* _tmp1_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "GetTest", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp2_);
- g_variant_unref (_tmp2_);
- g_object_unref (_reply_message);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _result = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ g_variant_unref (_reply);
return _result;
}
test_proxy_get_test (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _result = 0;
- GVariant* _tmp2_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "GetTest");
+ GVariant* _tmp1_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "GetTest", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp2_);
- g_variant_unref (_tmp2_);
- g_object_unref (_reply_message);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _result = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ g_variant_unref (_reply);
return _result;
}
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_test_void_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_test_void_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestVoid");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestVoid", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static void
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestInt");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (i));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestInt", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gint
gint* j,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gint _vala_j = 0;
- GVariant* _tmp2_;
+ GVariant* _tmp1_;
gint _result = 0;
- GVariant* _tmp3_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ GVariant* _tmp2_;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_j = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ *j = _vala_j;
_tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _vala_j = g_variant_get_int32 (_tmp2_);
+ _result = g_variant_get_int32 (_tmp2_);
g_variant_unref (_tmp2_);
- *j = _vala_j;
- _tmp3_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp3_);
- g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (s));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gchar*
gchar** t,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gchar* _vala_t = NULL;
- GVariant* _tmp4_;
+ GVariant* _tmp3_;
gchar* _result = NULL;
- GVariant* _tmp5_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant* _tmp4_;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp3_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_t = g_variant_dup_string (_tmp3_, NULL);
+ g_variant_unref (_tmp3_);
+ *t = _vala_t;
_tmp4_ = g_variant_iter_next_value (&_reply_iter);
- _vala_t = g_variant_dup_string (_tmp4_, NULL);
+ _result = g_variant_dup_string (_tmp4_, NULL);
g_variant_unref (_tmp4_);
- *t = _vala_t;
- _tmp5_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_dup_string (_tmp5_, NULL);
- g_variant_unref (_tmp5_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestCancellable");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, cancellable, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestCancellable", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, _callback_, _user_data_);
}
static void
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
{
GVariantIter _arguments_iter;
TestTestIntReadyData* _ready_data;
- GVariant* _tmp6_;
+ GVariant* _tmp5_;
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestIntReadyData);
_ready_data->_invocation_ = invocation;
- _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
- _ready_data->i = g_variant_get_int32 (_tmp6_);
- g_variant_unref (_tmp6_);
+ _tmp5_ = g_variant_iter_next_value (&_arguments_iter);
+ _ready_data->i = g_variant_get_int32 (_tmp5_);
+ g_variant_unref (_tmp5_);
test_test_int (self, _ready_data->i, (GAsyncReadyCallback) _dbus_test_test_int_ready, _ready_data);
}
{
GVariantIter _arguments_iter;
TestTestStringReadyData* _ready_data;
- GVariant* _tmp7_;
+ GVariant* _tmp6_;
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestStringReadyData);
_ready_data->_invocation_ = invocation;
- _tmp7_ = g_variant_iter_next_value (&_arguments_iter);
- _ready_data->s = g_variant_dup_string (_tmp7_, NULL);
- g_variant_unref (_tmp7_);
+ _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
+ _ready_data->s = g_variant_dup_string (_tmp6_, NULL);
+ g_variant_unref (_tmp6_);
test_test_string (self, _ready_data->s, (GAsyncReadyCallback) _dbus_test_test_string_ready, _ready_data);
_error:
;
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_list_messages_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_list_messages_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "ListMessages");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "ListMessages", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gchar**
gint* result_length1,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gchar** _result = NULL;
gint _tmp1__length1;
GVariantIter _tmp2_;
GVariant* _tmp3_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result_length1 = 0;
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_result = _tmp1_;
g_variant_unref (_tmp0_);
*result_length1 = _result_length1;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "PostMessage");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (message));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "PostMessage", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static void
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_test_void_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_);
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_test_void_async (Test* self,
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestVoid");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestVoid", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static void
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestInt");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (i));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestInt", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gint
gint* j,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gint _vala_j = 0;
- GVariant* _tmp2_;
+ GVariant* _tmp1_;
gint _result = 0;
- GVariant* _tmp3_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ GVariant* _tmp2_;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_j = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ *j = _vala_j;
_tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _vala_j = g_variant_get_int32 (_tmp2_);
+ _result = g_variant_get_int32 (_tmp2_);
g_variant_unref (_tmp2_);
- *j = _vala_j;
- _tmp3_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp3_);
- g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (s));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gchar*
gchar** t,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gchar* _vala_t = NULL;
- GVariant* _tmp4_;
+ GVariant* _tmp3_;
gchar* _result = NULL;
- GVariant* _tmp5_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ GVariant* _tmp4_;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp3_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_t = g_variant_dup_string (_tmp3_, NULL);
+ g_variant_unref (_tmp3_);
+ *t = _vala_t;
_tmp4_ = g_variant_iter_next_value (&_reply_iter);
- _vala_t = g_variant_dup_string (_tmp4_, NULL);
+ _result = g_variant_dup_string (_tmp4_, NULL);
g_variant_unref (_tmp4_);
- *t = _vala_t;
- _tmp5_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_dup_string (_tmp5_, NULL);
- g_variant_unref (_tmp5_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
{
GVariantIter _arguments_iter;
TestTestIntReadyData* _ready_data;
- GVariant* _tmp6_;
+ GVariant* _tmp5_;
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestIntReadyData);
_ready_data->_invocation_ = invocation;
- _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
- _ready_data->i = g_variant_get_int32 (_tmp6_);
- g_variant_unref (_tmp6_);
+ _tmp5_ = g_variant_iter_next_value (&_arguments_iter);
+ _ready_data->i = g_variant_get_int32 (_tmp5_);
+ g_variant_unref (_tmp5_);
test_test_int (self, _ready_data->i, (GAsyncReadyCallback) _dbus_test_test_int_ready, _ready_data);
}
{
GVariantIter _arguments_iter;
TestTestStringReadyData* _ready_data;
- GVariant* _tmp7_;
+ GVariant* _tmp6_;
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestStringReadyData);
_ready_data->_invocation_ = invocation;
- _tmp7_ = g_variant_iter_next_value (&_arguments_iter);
- _ready_data->s = g_variant_dup_string (_tmp7_, NULL);
- g_variant_unref (_tmp7_);
+ _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
+ _ready_data->s = g_variant_dup_string (_tmp6_, NULL);
+ g_variant_unref (_tmp6_);
test_test_string (self, _ready_data->s, (GAsyncReadyCallback) _dbus_test_test_string_ready, _ready_data);
_error:
;
test_proxy_test_void (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestVoid");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestVoid", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static gint
gint* j,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _vala_j = 0;
- GVariant* _tmp2_;
+ GVariant* _tmp1_;
gint _result = 0;
- GVariant* _tmp3_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestInt");
+ GVariant* _tmp2_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (i));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestInt", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_j = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ *j = _vala_j;
_tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _vala_j = g_variant_get_int32 (_tmp2_);
+ _result = g_variant_get_int32 (_tmp2_);
g_variant_unref (_tmp2_);
- *j = _vala_j;
- _tmp3_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp3_);
- g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gchar** t,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gchar* _vala_t = NULL;
- GVariant* _tmp4_;
+ GVariant* _tmp3_;
gchar* _result = NULL;
- GVariant* _tmp5_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
+ GVariant* _tmp4_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (s));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp3_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_t = g_variant_dup_string (_tmp3_, NULL);
+ g_variant_unref (_tmp3_);
+ *t = _vala_t;
_tmp4_ = g_variant_iter_next_value (&_reply_iter);
- _vala_t = g_variant_dup_string (_tmp4_, NULL);
+ _result = g_variant_dup_string (_tmp4_, NULL);
g_variant_unref (_tmp4_);
- *t = _vala_t;
- _tmp5_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_dup_string (_tmp5_, NULL);
- g_variant_unref (_tmp5_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GVariantType** tp2,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- gchar* _tmp6_;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
+ gchar* _tmp5_;
GVariantIter _reply_iter;
GVariantType* _vala_tp2 = NULL;
- GVariant* _tmp7_;
+ GVariant* _tmp6_;
GVariantType* _result = NULL;
- GVariant* _tmp8_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestSignature");
+ GVariant* _tmp7_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _tmp6_ = g_variant_type_dup_string (tp1);
- g_variant_builder_add_value (&_arguments_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp6_, strlen (_tmp6_) + 1, TRUE, g_free, _tmp6_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _tmp5_ = g_variant_type_dup_string (tp1);
+ g_variant_builder_add_value (&_arguments_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp5_, strlen (_tmp5_) + 1, TRUE, g_free, _tmp5_));
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestSignature", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp6_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_tp2 = g_variant_type_new (g_variant_get_string (_tmp6_, NULL));
+ g_variant_unref (_tmp6_);
+ *tp2 = _vala_tp2;
_tmp7_ = g_variant_iter_next_value (&_reply_iter);
- _vala_tp2 = g_variant_type_new (g_variant_get_string (_tmp7_, NULL));
+ _result = g_variant_type_new (g_variant_get_string (_tmp7_, NULL));
g_variant_unref (_tmp7_);
- *tp2 = _vala_tp2;
- _tmp8_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_type_new (g_variant_get_string (_tmp8_, NULL));
- g_variant_unref (_tmp8_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
_arguments = g_variant_builder_end (&_arguments_builder);
_reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Get", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
if (!_reply) {
- gint _tmp9_ = 0;
- return _tmp9_;
+ gint _tmp8_ = 0;
+ return _tmp8_;
}
g_variant_get (_reply, "(v)", &_inner_reply);
g_variant_unref (_reply);
GVariant *_arguments;
GVariant *_reply;
GVariantBuilder _arguments_builder;
- gchar* _tmp10_;
+ gchar* _tmp9_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("org.example.Test"));
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string ("TestSignatureProperty"));
g_variant_builder_open (&_arguments_builder, G_VARIANT_TYPE_VARIANT);
- _tmp10_ = g_variant_type_dup_string (value);
- g_variant_builder_add_value (&_arguments_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp10_, strlen (_tmp10_) + 1, TRUE, g_free, _tmp10_));
+ _tmp9_ = g_variant_type_dup_string (value);
+ g_variant_builder_add_value (&_arguments_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp9_, strlen (_tmp9_) + 1, TRUE, g_free, _tmp9_));
g_variant_builder_close (&_arguments_builder);
_arguments = g_variant_builder_end (&_arguments_builder);
_reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "org.freedesktop.DBus.Properties.Set", _arguments, G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
GError* error = NULL;
GVariantIter _arguments_iter;
gint i = 0;
- GVariant* _tmp11_;
+ GVariant* _tmp10_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
gint j = 0;
gint result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _tmp11_ = g_variant_iter_next_value (&_arguments_iter);
- i = g_variant_get_int32 (_tmp11_);
- g_variant_unref (_tmp11_);
+ _tmp10_ = g_variant_iter_next_value (&_arguments_iter);
+ i = g_variant_get_int32 (_tmp10_);
+ g_variant_unref (_tmp10_);
result = test_test_int (self, i, &j, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GError* error = NULL;
GVariantIter _arguments_iter;
gchar* s = NULL;
- GVariant* _tmp12_;
+ GVariant* _tmp11_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
gchar* t = NULL;
gchar* result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _tmp12_ = g_variant_iter_next_value (&_arguments_iter);
- s = g_variant_dup_string (_tmp12_, NULL);
- g_variant_unref (_tmp12_);
+ _tmp11_ = g_variant_iter_next_value (&_arguments_iter);
+ s = g_variant_dup_string (_tmp11_, NULL);
+ g_variant_unref (_tmp11_);
result = test_test_string (self, s, &t, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GError* error = NULL;
GVariantIter _arguments_iter;
GVariantType* tp1 = NULL;
- GVariant* _tmp13_;
+ GVariant* _tmp12_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
GVariantType* tp2 = NULL;
- gchar* _tmp14_;
+ gchar* _tmp13_;
GVariantType* result;
- gchar* _tmp15_;
+ gchar* _tmp14_;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _tmp13_ = g_variant_iter_next_value (&_arguments_iter);
- tp1 = g_variant_type_new (g_variant_get_string (_tmp13_, NULL));
- g_variant_unref (_tmp13_);
+ _tmp12_ = g_variant_iter_next_value (&_arguments_iter);
+ tp1 = g_variant_type_new (g_variant_get_string (_tmp12_, NULL));
+ g_variant_unref (_tmp12_);
result = test_test_signature (self, tp1, &tp2, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
}
_reply_message = g_dbus_message_new_method_reply (g_dbus_method_invocation_get_message (invocation));
g_variant_builder_init (&_reply_builder, G_VARIANT_TYPE_TUPLE);
- _tmp14_ = g_variant_type_dup_string (tp2);
+ _tmp13_ = g_variant_type_dup_string (tp2);
+ g_variant_builder_add_value (&_reply_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp13_, strlen (_tmp13_) + 1, TRUE, g_free, _tmp13_));
+ _tmp14_ = g_variant_type_dup_string (result);
g_variant_builder_add_value (&_reply_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp14_, strlen (_tmp14_) + 1, TRUE, g_free, _tmp14_));
- _tmp15_ = g_variant_type_dup_string (result);
- g_variant_builder_add_value (&_reply_builder, g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp15_, strlen (_tmp15_) + 1, TRUE, g_free, _tmp15_));
_g_variant_type_free0 (result);
_reply = g_variant_builder_end (&_reply_builder);
g_dbus_message_set_body (_reply_message, _reply);
{
GVariantType* result;
GVariant* _reply;
- gchar* _tmp16_;
+ gchar* _tmp15_;
result = test_get_test_signature_property (self);
- _tmp16_ = g_variant_type_dup_string (result);
- _reply = g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp16_, strlen (_tmp16_) + 1, TRUE, g_free, _tmp16_);
+ _tmp15_ = g_variant_type_dup_string (result);
+ _reply = g_variant_new_from_data (G_VARIANT_TYPE_SIGNATURE, _tmp15_, strlen (_tmp15_) + 1, TRUE, g_free, _tmp15_);
_g_variant_type_free0 (result);
return _reply;
}
test_proxy_test_string (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GVariant* _result = NULL;
GVariant* _tmp0_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_result = g_variant_get_variant (_tmp0_);
g_variant_unref (_tmp0_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gint* result_length1,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gdouble* _result = NULL;
gint _result_length1;
gint _tmp1__length1;
GVariantIter _tmp2_;
GVariant* _tmp3_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Array");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Array", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result_length1 = 0;
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_result = _tmp1_;
g_variant_unref (_tmp0_);
*result_length1 = _result_length1;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gint* result_length2,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gdouble* _result = NULL;
gint _result_length1;
gint _tmp5__length1;
GVariantIter _tmp6_;
GVariant* _tmp7_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "MultiArray");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "MultiArray", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result_length1 = 0;
_result_length2 = 0;
g_variant_unref (_tmp4_);
*result_length1 = _result_length1;
*result_length2 = _result_length2;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gint* result_length3,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gchar** _result = NULL;
gint _result_length1;
gint _tmp11__length1;
GVariantIter _tmp12_;
GVariant* _tmp13_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "MultiArray2");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "MultiArray2", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result_length1 = 0;
_result_length2 = 0;
*result_length1 = _result_length1;
*result_length2 = _result_length2;
*result_length3 = _result_length3;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
test_proxy_test_nested_dict (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GHashTable* _result = NULL;
GVariant* _tmp0_;
GVariantIter _tmp2_;
GVariant* _tmp3_;
GVariant* _tmp4_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestNestedDict");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestNestedDict", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_tmp1_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_hash_table_unref);
}
_result = _tmp1_;
g_variant_unref (_tmp0_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_test_array_lifetime_async (Test* self,
gchar** items,
gint items_length1,
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_test_array_lifetime_async (Test* self,
gchar** items,
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
gchar** _tmp0_;
GVariantBuilder _tmp1_;
gint _tmp2_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestArrayLifetime");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_tmp0_ = items;
g_variant_builder_init (&_tmp1_, G_VARIANT_TYPE ("as"));
_tmp0_++;
}
g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp1_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "TestArrayLifetime", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static gchar*
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
GVariant *_reply;
GVariantIter _reply_iter;
gchar* _result = NULL;
GVariant* _tmp3_;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp3_ = g_variant_iter_next_value (&_reply_iter);
_result = g_variant_dup_string (_tmp3_, NULL);
g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
ifoo_proxy_method0 (IFoo* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.IFoo", "Method0");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Method0", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
ifoo_proxy_method1 (IFoo* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.IFoo", "Method1");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Method1", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
ifoo_proxy_method2 (IFoo* self)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.IFoo", "Method2");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, NULL);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, NULL)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Method2", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
test_proxy_get_test (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _result = 0;
- GVariant* _tmp2_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "GetTest");
+ GVariant* _tmp1_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "GetTest", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp2_);
- g_variant_unref (_tmp2_);
- g_object_unref (_reply_message);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _result = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ g_variant_unref (_reply);
return _result;
}
test_proxy_test_dict (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GHashTable* _result = NULL;
GVariant* _tmp0_;
GVariantIter _tmp2_;
GVariant* _tmp3_;
GVariant* _tmp4_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestDict");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestDict", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_tmp1_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
}
_result = _tmp1_;
g_variant_unref (_tmp0_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
test_proxy_test_variant_dict (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GVariantDict* _result = NULL;
GVariant* _tmp5_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestVariantDict");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestVariantDict", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp5_ = g_variant_iter_next_value (&_reply_iter);
_result = g_variant_dict_new (_tmp5_);
g_variant_unref (_tmp5_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
test_interface_bar_proxy_foo (TestInterfaceBar* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GHashTable* _result = NULL;
GVariant* _tmp4_;
GVariantIter _tmp6_;
GVariant* _tmp7_;
GVariant* _tmp8_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.vala.Test.Bar", "Foo");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Foo", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp4_ = g_variant_iter_next_value (&_reply_iter);
_tmp5_ = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_variant_unref);
}
_result = _tmp5_;
g_variant_unref (_tmp4_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gchar* s;
gint i;
GDBusProxy* _tmp5_;
- gchar* _tmp10_;
- gint _tmp11_;
- const gchar* _tmp12_;
- GMainLoop* _tmp13_;
+ gchar* _tmp9_;
+ gint _tmp10_;
+ const gchar* _tmp11_;
+ GMainLoop* _tmp12_;
GError* _inner_error0_;
};
gchar** param2,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gchar* _vala_param2 = NULL;
- GVariant* _tmp8_;
+ GVariant* _tmp7_;
gint _result = 0;
- GVariant* _tmp9_;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), g_dbus_proxy_get_interface_name ((GDBusProxy *) self), "do_foo");
+ GVariant* _tmp8_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (param1));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp6_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "do_foo", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp6_ = -1;
return _tmp6_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp7_ = 0;
- g_object_unref (_reply_message);
- return _tmp7_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp7_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_param2 = g_variant_dup_string (_tmp7_, NULL);
+ g_variant_unref (_tmp7_);
+ *param2 = _vala_param2;
_tmp8_ = g_variant_iter_next_value (&_reply_iter);
- _vala_param2 = g_variant_dup_string (_tmp8_, NULL);
+ _result = g_variant_get_int32 (_tmp8_);
g_variant_unref (_tmp8_);
- *param2 = _vala_param2;
- _tmp9_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp9_);
- g_variant_unref (_tmp9_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
goto __catch0_g_error;
}
_data_->_tmp5_ = _data_->test;
- _data_->_tmp10_ = NULL;
- _data_->_tmp11_ = _dynamic_do_foo0 (_data_->_tmp5_, 42, &_data_->_tmp10_, &_data_->_inner_error0_);
+ _data_->_tmp9_ = NULL;
+ _data_->_tmp10_ = _dynamic_do_foo0 (_data_->_tmp5_, 42, &_data_->_tmp9_, &_data_->_inner_error0_);
_g_free0 (_data_->s);
- _data_->s = _data_->_tmp10_;
- _data_->i = _data_->_tmp11_;
+ _data_->s = _data_->_tmp9_;
+ _data_->i = _data_->_tmp10_;
if (G_UNLIKELY (_data_->_inner_error0_ != NULL)) {
_g_free0 (_data_->s);
_g_object_unref0 (_data_->test);
goto __catch0_g_error;
}
_vala_assert (_data_->i == 23, "i == 23");
- _data_->_tmp12_ = _data_->s;
- _vala_assert (g_strcmp0 (_data_->_tmp12_, "foo") == 0, "s == \"foo\"");
+ _data_->_tmp11_ = _data_->s;
+ _vala_assert (g_strcmp0 (_data_->_tmp11_, "foo") == 0, "s == \"foo\"");
_g_free0 (_data_->s);
_g_object_unref0 (_data_->test);
_g_object_unref0 (_data_->bus);
g_object_unref (_data_->_async_result);
return FALSE;
}
- _data_->_tmp13_ = main_loop;
- g_main_loop_quit (_data_->_tmp13_);
+ _data_->_tmp12_ = main_loop;
+ g_main_loop_quit (_data_->_tmp12_);
g_task_return_pointer (_data_->_async_result, _data_, NULL);
if (_data_->_state_ != 0) {
while (!g_task_get_completed (_data_->_async_result)) {
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_test1_async (Test* self,
FooEnum e,
GAsyncReadyCallback _callback_,
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_test1_async (Test* self,
FooEnum e,
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_DBUS_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test1");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e)));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "Test1", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static void
GAsyncResult* _res_,
GError** error)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
FooEnum e,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_DBUS_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test2");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e)));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Test2", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
FooEnum e2,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_DBUS_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test3");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e1)));
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (fd));
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e2)));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Test3", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
test_proxy_test4 (Test* self,
FooEnum e)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test4");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e)));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, NULL);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Test4", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, NULL)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
GAsyncReadyCallback _callback_,
gpointer _user_data_)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test5");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (foo_enum_to_string (e)));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "Test5", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, _callback_, _user_data_);
}
static void
test_proxy_test5_finish (Test* self,
GAsyncResult* _res_)
{
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, NULL);
- g_object_unref (_inner_res);
- if (!_reply_message) {
+ GVariant *_reply;
+ _reply = g_dbus_proxy_call_finish ((GDBusProxy *) self, _res_, NULL);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, NULL)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
test_proxy_test_void (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestVoid");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestVoid", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static gint
gint* j,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _vala_j = 0;
- GVariant* _tmp2_;
+ GVariant* _tmp1_;
gint _result = 0;
- GVariant* _tmp3_;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestInt");
+ GVariant* _tmp2_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (i));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestInt", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_j = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ *j = _vala_j;
_tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _vala_j = g_variant_get_int32 (_tmp2_);
+ _result = g_variant_get_int32 (_tmp2_);
g_variant_unref (_tmp2_);
- *j = _vala_j;
- _tmp3_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp3_);
- g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gchar** t,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gchar* _vala_t = NULL;
- GVariant* _tmp4_;
+ GVariant* _tmp3_;
gchar* _result = NULL;
- GVariant* _tmp5_;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestString");
+ GVariant* _tmp4_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (s));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestString", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
+ _tmp3_ = g_variant_iter_next_value (&_reply_iter);
+ _vala_t = g_variant_dup_string (_tmp3_, NULL);
+ g_variant_unref (_tmp3_);
+ *t = _vala_t;
_tmp4_ = g_variant_iter_next_value (&_reply_iter);
- _vala_t = g_variant_dup_string (_tmp4_, NULL);
+ _result = g_variant_dup_string (_tmp4_, NULL);
g_variant_unref (_tmp4_);
- *t = _vala_t;
- _tmp5_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_dup_string (_tmp5_, NULL);
- g_variant_unref (_tmp5_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
GCancellable* cancellable,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestCancellable");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, cancellable, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestCancellable", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, cancellable, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
test_proxy_test_custom_error (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
TEST_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestCustomError");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestCustomError", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
GError* error = NULL;
GVariantIter _arguments_iter;
gint i = 0;
- GVariant* _tmp6_;
+ GVariant* _tmp5_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
gint j = 0;
gint result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
- i = g_variant_get_int32 (_tmp6_);
- g_variant_unref (_tmp6_);
+ _tmp5_ = g_variant_iter_next_value (&_arguments_iter);
+ i = g_variant_get_int32 (_tmp5_);
+ g_variant_unref (_tmp5_);
result = test_test_int (self, i, &j, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GError* error = NULL;
GVariantIter _arguments_iter;
gchar* s = NULL;
- GVariant* _tmp7_;
+ GVariant* _tmp6_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
gchar* t = NULL;
gchar* result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _tmp7_ = g_variant_iter_next_value (&_arguments_iter);
- s = g_variant_dup_string (_tmp7_, NULL);
- g_variant_unref (_tmp7_);
+ _tmp6_ = g_variant_iter_next_value (&_arguments_iter);
+ s = g_variant_dup_string (_tmp6_, NULL);
+ g_variant_unref (_tmp6_);
result = test_test_string (self, s, &t, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
const gchar* sender_name,
const gchar* signal_name,
GVariant* parameters);
-static void _vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data);
static void test_proxy_test_in_async (Test* self,
GUnixInputStream* i,
GAsyncReadyCallback _callback_,
g_dbus_proxy_set_interface_info (G_DBUS_PROXY (self), (GDBusInterfaceInfo *) (&_test_dbus_interface_info));
}
-static void
-_vala_g_async_ready_callback (GObject *source_object,
- GAsyncResult *res,
- void *user_data)
-{
- g_task_return_pointer (user_data, g_object_ref (res), g_object_unref);
- g_object_unref (user_data);
-}
-
static void
test_proxy_test_in_async (Test* self,
GUnixInputStream* i,
gpointer _user_data_)
{
GUnixFDList* _fd_list;
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestIn");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_fd_list = g_unix_fd_list_new ();
g_variant_builder_add (&_arguments_builder, "h", g_unix_fd_list_append (_fd_list, g_unix_input_stream_get_fd (i), NULL));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- g_dbus_message_set_unix_fd_list (_message, _fd_list);
+ g_dbus_proxy_call_with_unix_fd_list ((GDBusProxy *) self, "TestIn", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, _fd_list, NULL, _callback_, _user_data_);
g_object_unref (_fd_list);
- if (_callback_ != NULL) {
- g_dbus_connection_send_message_with_reply (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, _vala_g_async_ready_callback, g_task_new ((GObject *) self, NULL, _callback_, _user_data_));
- } else {
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, NULL);
- }
- g_object_unref (_message);
}
static GUnixInputStream*
GError** error)
{
GUnixFDList* _fd_list;
- GAsyncResult *_inner_res;
- GDBusMessage *_reply_message;
+ GUnixFDList* _out_fd_list;
+ GVariant *_reply;
gint _fd_index = 0;
gint _fd;
- GVariant *_reply;
GVariantIter _reply_iter;
GUnixInputStream* _vala_j = NULL;
GUnixInputStream* _result = NULL;
- _inner_res = g_task_propagate_pointer ((GTask *) _res_, NULL);
- _reply_message = g_dbus_connection_send_message_with_reply_finish (g_dbus_proxy_get_connection ((GDBusProxy *) self), _inner_res, error);
- g_object_unref (_inner_res);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_with_unix_fd_list_finish ((GDBusProxy *) self, &_out_fd_list, _res_, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _fd_list = g_dbus_message_get_unix_fd_list (_reply_message);
- if (_fd_list) {
+ if (_out_fd_list) {
g_variant_iter_next (&_reply_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, error);
+ _fd = g_unix_fd_list_get (_out_fd_list, _fd_index, error);
if (_fd >= 0) {
_vala_j = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
*j = _vala_j;
if (error && (*error)) {
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return NULL;
}
- _fd_list = g_dbus_message_get_unix_fd_list (_reply_message);
- if (_fd_list) {
+ if (_out_fd_list) {
g_variant_iter_next (&_reply_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, error);
+ _fd = g_unix_fd_list_get (_out_fd_list, _fd_index, error);
if (_fd >= 0) {
_result = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error && (*error)) {
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return NULL;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return _result;
}
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestInReadyData);
_ready_data->_invocation_ = invocation;
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
_ready_data->i = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
g_variant_iter_init (&_arguments_iter, _parameters_);
_ready_data = g_slice_new0 (TestTestInReadyData);
_ready_data->_invocation_ = invocation;
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
_ready_data->i = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GError** error)
{
GUnixFDList* _fd_list;
- GDBusMessage *_message;
- GVariant *_arguments;
+ GUnixFDList* _out_fd_list;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
gint _fd_index = 0;
gint _fd;
- GVariant *_reply;
GVariantIter _reply_iter;
gchar* _result = NULL;
GVariant* _tmp0_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Test");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_fd_list = g_unix_fd_list_new ();
g_variant_builder_add (&_arguments_builder, "h", g_unix_fd_list_append (_fd_list, g_unix_output_stream_get_fd (output_stream), NULL));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- g_dbus_message_set_unix_fd_list (_message, _fd_list);
+ _reply = g_dbus_proxy_call_with_unix_fd_list_sync ((GDBusProxy *) self, "Test", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, _fd_list, &_out_fd_list, NULL, error);
g_object_unref (_fd_list);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_result = g_variant_dup_string (_tmp0_, NULL);
g_variant_unref (_tmp0_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return _result;
}
GVariantBuilder _reply_builder;
gchar* result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
output_stream = (GUnixOutputStream *) g_unix_output_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GVariant* _reply;
GVariantBuilder _reply_builder;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
output_stream = (GUnixOutputStream *) g_unix_output_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GError** error)
{
GUnixFDList* _fd_list;
- GDBusMessage *_message;
- GVariant *_arguments;
+ GUnixFDList* _out_fd_list;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
gint _fd_index = 0;
gint _fd;
- GVariant *_reply;
GVariantIter _reply_iter;
GUnixInputStream* _vala_j = NULL;
GUnixInputStream* _result = NULL;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestIn");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_fd_list = g_unix_fd_list_new ();
g_variant_builder_add (&_arguments_builder, "h", g_unix_fd_list_append (_fd_list, g_unix_input_stream_get_fd (i), NULL));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- g_dbus_message_set_unix_fd_list (_message, _fd_list);
+ _reply = g_dbus_proxy_call_with_unix_fd_list_sync ((GDBusProxy *) self, "TestIn", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, _fd_list, &_out_fd_list, NULL, error);
g_object_unref (_fd_list);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _fd_list = g_dbus_message_get_unix_fd_list (_reply_message);
- if (_fd_list) {
+ if (_out_fd_list) {
g_variant_iter_next (&_reply_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, error);
+ _fd = g_unix_fd_list_get (_out_fd_list, _fd_index, error);
if (_fd >= 0) {
_vala_j = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
*j = _vala_j;
if (error && (*error)) {
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return NULL;
}
- _fd_list = g_dbus_message_get_unix_fd_list (_reply_message);
- if (_fd_list) {
+ if (_out_fd_list) {
g_variant_iter_next (&_reply_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, error);
+ _fd = g_unix_fd_list_get (_out_fd_list, _fd_index, error);
if (_fd >= 0) {
_result = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error && (*error)) {
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return NULL;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
+ if (_out_fd_list) {
+ g_object_unref (_out_fd_list);
+ }
return _result;
}
GUnixInputStream* j = NULL;
GUnixInputStream* result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
i = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GUnixInputStream* j = NULL;
GUnixInputStream* result;
g_variant_iter_init (&_arguments_iter, _parameters_);
- _fd_list = g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation));
- if (_fd_list) {
+ if (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation))) {
g_variant_iter_next (&_arguments_iter, "h", &_fd_index);
- _fd = g_unix_fd_list_get (_fd_list, _fd_index, &error);
+ _fd = g_unix_fd_list_get (g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)), _fd_index, &error);
if (_fd >= 0) {
i = (GUnixInputStream *) g_unix_input_stream_new (_fd, TRUE);
}
} else {
- g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "FD List is NULL");
+ g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED, "No file descriptor returned");
}
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
test_proxy_get_test (Test* self,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _result = 0;
- GVariant* _tmp2_;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "GetTest");
+ GVariant* _tmp1_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp0_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "GetTest", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp0_ = -1;
return _tmp0_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp1_ = 0;
- g_object_unref (_reply_message);
- return _tmp1_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _tmp2_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp2_);
- g_variant_unref (_tmp2_);
- g_object_unref (_reply_message);
+ _tmp1_ = g_variant_iter_next_value (&_reply_iter);
+ _result = g_variant_get_int32 (_tmp1_);
+ g_variant_unref (_tmp1_);
+ g_variant_unref (_reply);
return _result;
}
gint* result_length1,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gchar** _result = NULL;
gint _result_length1;
gint _tmp1__length1;
GVariantIter _tmp2_;
GVariant* _tmp3_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "ListMessages");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "ListMessages", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return NULL;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result_length1 = 0;
_tmp0_ = g_variant_iter_next_value (&_reply_iter);
_result = _tmp1_;
g_variant_unref (_tmp0_);
*result_length1 = _result_length1;
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
const gchar* message,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "PostMessage");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (message));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "PostMessage", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
const gchar* message,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
GVariantBuilder _arguments_builder;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "PostMessageNoReply");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_string (message));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- g_dbus_message_set_flags (_message, G_DBUS_MESSAGE_FLAGS_NO_REPLY_EXPECTED);
- g_dbus_connection_send_message (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, NULL, error);
- g_object_unref (_message);
+ g_dbus_proxy_call ((GDBusProxy *) self, "PostMessageNoReply", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL, NULL);
}
static void
static void
test_proxy_verify (Test* self)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "Verify");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, NULL);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, NULL)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "Verify", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, NULL);
+ if (!_reply) {
return;
}
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static gint
gint k,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
gint _result = 0;
- GVariant* _tmp3_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestMethod");
+ GVariant* _tmp2_;
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (j));
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (k));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- gint _tmp1_ = 0;
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestMethod", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
+ gint _tmp1_ = -1;
return _tmp1_;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- gint _tmp2_ = 0;
- g_object_unref (_reply_message);
- return _tmp2_;
- }
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
- _tmp3_ = g_variant_iter_next_value (&_reply_iter);
- _result = g_variant_get_int32 (_tmp3_);
- g_variant_unref (_tmp3_);
- g_object_unref (_reply_message);
+ _tmp2_ = g_variant_iter_next_value (&_reply_iter);
+ _result = g_variant_get_int32 (_tmp2_);
+ g_variant_unref (_tmp2_);
+ g_variant_unref (_reply);
return _result;
}
GError* error = NULL;
GVariantIter _arguments_iter;
gint j = 0;
- GVariant* _tmp4_;
+ GVariant* _tmp3_;
gint k = 0;
- GVariant* _tmp5_;
+ GVariant* _tmp4_;
GDBusMessage* _reply_message = NULL;
GVariant* _reply;
GVariantBuilder _reply_builder;
gint result;
g_variant_iter_init (&_arguments_iter, _parameters_);
+ _tmp3_ = g_variant_iter_next_value (&_arguments_iter);
+ j = g_variant_get_int32 (_tmp3_);
+ g_variant_unref (_tmp3_);
_tmp4_ = g_variant_iter_next_value (&_arguments_iter);
- j = g_variant_get_int32 (_tmp4_);
+ k = g_variant_get_int32 (_tmp4_);
g_variant_unref (_tmp4_);
- _tmp5_ = g_variant_iter_next_value (&_arguments_iter);
- k = g_variant_get_int32 (_tmp5_);
- g_variant_unref (_tmp5_);
result = test_test_method (self, j, k, &error);
if (error) {
g_dbus_method_invocation_take_error (invocation, error);
GVariant* k,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
- GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
GVariant *_reply;
+ GVariantBuilder _arguments_builder;
GVariantIter _reply_iter;
GVariant* _result = NULL;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestMethod");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, j);
g_variant_builder_add_value (&_arguments_builder, k);
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return NULL;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestMethod", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return NULL;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_result = g_variant_iter_next_value (&_reply_iter);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
return _result;
}
gint i,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
- GDBusMessage *_reply_message;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "DoFoo");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_arguments_builder, g_variant_new_int32 (i));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "DoFoo", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
gint baz_length1,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
gchar** _tmp5_;
GVariantBuilder _tmp6_;
gint _tmp7_;
- GDBusMessage *_reply_message;
- G_DBUS_ERROR;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "DoBar");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
_tmp5_ = baz;
g_variant_builder_init (&_tmp6_, G_VARIANT_TYPE ("as"));
_tmp5_++;
}
g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp6_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "DoBar", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
- return;
- }
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
FooStruct* result,
GError** error)
{
- GDBusMessage *_message;
- GVariant *_arguments;
+ GVariant *_reply;
GVariantBuilder _arguments_builder;
GVariantBuilder _tmp0_;
- GDBusMessage *_reply_message;
- GVariant *_reply;
GVariantIter _reply_iter;
FooStruct _vala_g = {0};
GVariant* _tmp1_;
GVariantIter _tmp8_;
GVariant* _tmp9_;
GVariant* _tmp10_;
- G_IO_ERROR;
- _message = g_dbus_message_new_method_call (g_dbus_proxy_get_name ((GDBusProxy *) self), g_dbus_proxy_get_object_path ((GDBusProxy *) self), "org.example.Test", "TestStruct");
g_variant_builder_init (&_arguments_builder, G_VARIANT_TYPE_TUPLE);
g_variant_builder_init (&_tmp0_, G_VARIANT_TYPE_TUPLE);
g_variant_builder_add_value (&_tmp0_, g_variant_new_int32 ((*f).i));
g_variant_builder_add_value (&_tmp0_, g_variant_new_string ((*f).s));
g_variant_builder_add_value (&_arguments_builder, g_variant_builder_end (&_tmp0_));
- _arguments = g_variant_builder_end (&_arguments_builder);
- g_dbus_message_set_body (_message, _arguments);
- _reply_message = g_dbus_connection_send_message_with_reply_sync (g_dbus_proxy_get_connection ((GDBusProxy *) self), _message, G_DBUS_SEND_MESSAGE_FLAGS_NONE, g_dbus_proxy_get_default_timeout ((GDBusProxy *) self), NULL, NULL, error);
- g_object_unref (_message);
- if (!_reply_message) {
- return;
- }
- if (g_dbus_message_to_gerror (_reply_message, error)) {
- g_object_unref (_reply_message);
+ _reply = g_dbus_proxy_call_sync ((GDBusProxy *) self, "TestStruct", g_variant_builder_end (&_arguments_builder), G_DBUS_CALL_FLAGS_NONE, -1, NULL, error);
+ if (!_reply) {
return;
}
- _reply = g_dbus_message_get_body (_reply_message);
g_variant_iter_init (&_reply_iter, _reply);
_tmp1_ = g_variant_iter_next_value (&_reply_iter);
g_variant_iter_init (&_tmp3_, _tmp1_);
g_variant_unref (_tmp10_);
*result = _tmp7_;
g_variant_unref (_tmp6_);
- g_object_unref (_reply_message);
+ g_variant_unref (_reply);
}
static void
projects / thirdparty / vala.git / commitdiff
