diff --git a/legacy/edbus/src/examples/complex_types_server.c b/legacy/edbus/src/examples/complex_types_server.c index acf3dfae95..e3d0ad609d 100644 --- a/legacy/edbus/src/examples/complex_types_server.c +++ b/legacy/edbus/src/examples/complex_types_server.c @@ -231,7 +231,7 @@ _properties_get(const EDBus_Service_Interface *iface, const EDBus_Message *msg) reply = edbus_message_method_return_new(msg); iter = edbus_message_iter_get(reply); variant = edbus_message_iter_container_new(iter, 'v', "s"); - edbus_message_iter_append_basic(variant, 's', resp2); + edbus_message_iter_basic_append(variant, 's', resp2); printf("get %s\n", resp2); edbus_message_iter_container_close(iter, variant); diff --git a/legacy/edbus/src/lib/edbus_message.c b/legacy/edbus/src/lib/edbus_message.c index af2955fdd0..a2af89425b 100644 --- a/legacy/edbus/src/lib/edbus_message.c +++ b/legacy/edbus/src/lib/edbus_message.c @@ -505,7 +505,7 @@ edbus_message_iter_container_close(EDBus_Message_Iter *iter, EDBus_Message_Iter } EAPI Eina_Bool -edbus_message_iter_append_basic(EDBus_Message_Iter *iter, int type, ...) +edbus_message_iter_basic_append(EDBus_Message_Iter *iter, int type, ...) { Eina_Bool r; va_list vl; @@ -520,7 +520,7 @@ edbus_message_iter_append_basic(EDBus_Message_Iter *iter, int type, ...) } EAPI void -edbus_message_iter_get_basic(EDBus_Message_Iter *iter, void *value) +edbus_message_iter_basic_get(EDBus_Message_Iter *iter, void *value) { EDBUS_MESSAGE_ITERATOR_CHECK(iter); EINA_SAFETY_ON_TRUE_RETURN(iter->writable); diff --git a/legacy/edbus/src/lib/edbus_message.h b/legacy/edbus/src/lib/edbus_message.h index 5986b5b60a..734fb51c25 100644 --- a/legacy/edbus/src/lib/edbus_message.h +++ b/legacy/edbus/src/lib/edbus_message.h @@ -125,7 +125,7 @@ EAPI EDBus_Message_Iter *edbus_message_iter_container_new(EDBus_Message_Iter *it /** * @brief Append a basic type to EDBus_Iterator. */ -EAPI Eina_Bool edbus_message_iter_append_basic(EDBus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3); +EAPI Eina_Bool edbus_message_iter_basic_append(EDBus_Message_Iter *iter, int type, ...) EINA_ARG_NONNULL(1, 3); /** * @brief Set data to EDBus_Message_Iter. For each complete in signature * you need pass the value, in case of complex type a pointer to be allocated a @@ -181,7 +181,7 @@ EAPI EDBus_Message_Iter *edbus_message_iter_get(EDBus_Message *msg) EINA_ARG_NON /** * @brief Get a basic type from EDBus_Iterator. */ -EAPI void edbus_message_iter_get_basic(EDBus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2); +EAPI void edbus_message_iter_basic_get(EDBus_Message_Iter *iter, void *value) EINA_ARG_NONNULL(1, 2); /** * @brief Returns the current signature of a message iterator. * diff --git a/legacy/edbus/src/lib/edbus_proxy.c b/legacy/edbus/src/lib/edbus_proxy.c index 2f54b7dff2..998dc36be6 100644 --- a/legacy/edbus/src/lib/edbus_proxy.c +++ b/legacy/edbus/src/lib/edbus_proxy.c @@ -521,10 +521,10 @@ edbus_proxy_property_set(EDBus_Proxy *proxy, const char *name, char type, const sig[1] = 0; msg = edbus_proxy_method_call_new(get_properties_proxy(proxy), "Set"); iter = edbus_message_iter_get(msg); - edbus_message_iter_append_basic(iter, 's', proxy->interface); - edbus_message_iter_append_basic(iter, 's', name); + edbus_message_iter_basic_append(iter, 's', proxy->interface); + edbus_message_iter_basic_append(iter, 's', name); variant = edbus_message_iter_container_new(iter, 'v', sig); - edbus_message_iter_append_basic(variant, type, value); + edbus_message_iter_basic_append(variant, type, value); edbus_message_iter_container_close(iter, variant); pending = edbus_proxy_send(get_properties_proxy(proxy), msg, cb, data, -1);