From 3c0db21e44274d447714339a77d22b51640fef2f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Date: Fri, 16 Nov 2012 13:07:45 +0000 Subject: [PATCH] edbus: Rename edbus_object_bus_path_get() to edbus_object_path_get() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by: José Roberto de Souza SVN revision: 79387 --- src/lib/edbus_object.c | 2 +- src/lib/edbus_object.h | 2 +- src/lib/edbus_proxy.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/edbus_object.c b/src/lib/edbus_object.c index 22ff597..840e2db 100644 --- a/src/lib/edbus_object.c +++ b/src/lib/edbus_object.c @@ -360,7 +360,7 @@ edbus_object_bus_name_get(const EDBus_Object *obj) } EAPI const char * -edbus_object_bus_path_get(const EDBus_Object *obj) +edbus_object_path_get(const EDBus_Object *obj) { EDBUS_OBJECT_CHECK_RETVAL(obj, NULL); return obj->path; diff --git a/src/lib/edbus_object.h b/src/lib/edbus_object.h index de1f345..8e886e7 100644 --- a/src/lib/edbus_object.h +++ b/src/lib/edbus_object.h @@ -87,7 +87,7 @@ EAPI void edbus_object_event_callback_del(EDBus_Object *obj, ED EAPI EDBus_Connection *edbus_object_connection_get(const EDBus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; EAPI const char *edbus_object_bus_name_get(const EDBus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; -EAPI const char *edbus_object_bus_path_get(const EDBus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; +EAPI const char *edbus_object_path_get(const EDBus_Object *obj) EINA_ARG_NONNULL(1) EINA_WARN_UNUSED_RESULT; /** * @brief Send a message. diff --git a/src/lib/edbus_proxy.c b/src/lib/edbus_proxy.c index 66c87d0..25305e4 100644 --- a/src/lib/edbus_proxy.c +++ b/src/lib/edbus_proxy.c @@ -532,7 +532,7 @@ edbus_proxy_method_call_new(EDBus_Proxy *proxy, const char *member) msg = edbus_message_method_call_new( edbus_object_bus_name_get(proxy->obj), - edbus_object_bus_path_get(proxy->obj), + edbus_object_path_get(proxy->obj), proxy->interface, member); return msg; } @@ -603,7 +603,7 @@ edbus_proxy_signal_handler_add(EDBus_Proxy *proxy, const char *member, EDBus_Sig EINA_SAFETY_ON_NULL_RETURN_VAL(cb, NULL); name = edbus_object_bus_name_get(proxy->obj); - path = edbus_object_bus_path_get(proxy->obj); + path = edbus_object_path_get(proxy->obj); handler = edbus_signal_handler_add(proxy->obj->conn, name, path, proxy->interface, member, cb, cb_data); -- 2.7.4