From cbc0a8311a5847ee4d97a317854eafa53f4afab3 Mon Sep 17 00:00:00 2001 From: Lucas De Marchi Date: Tue, 11 Dec 2012 19:52:02 +0000 Subject: [PATCH] edbus: Better naming for FDO proxy in connection Patch by: Lucas De Marchi SVN revision: 80707 --- legacy/edbus/src/lib/edbus_core.c | 2 +- legacy/edbus/src/lib/edbus_freedesktop.c | 14 +++++++------- legacy/edbus/src/lib/edbus_private_types.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/legacy/edbus/src/lib/edbus_core.c b/legacy/edbus/src/lib/edbus_core.c index e948889cdd..67db87342d 100644 --- a/legacy/edbus/src/lib/edbus_core.c +++ b/legacy/edbus/src/lib/edbus_core.c @@ -947,7 +947,7 @@ _connection_get(EDBus_Connection_Type type) edbus_signal_handler_add(conn, NULL, DBUS_PATH_LOCAL, DBUS_INTERFACE_LOCAL, "Disconnected", _disconnected, conn); obj = edbus_object_get(conn, EDBUS_FDO_BUS, EDBUS_FDO_PATH); - conn->daemon = edbus_proxy_get(obj, EDBUS_FDO_INTERFACE); + conn->fdo_proxy = edbus_proxy_get(obj, EDBUS_FDO_INTERFACE); DBG("Returned new connection at %p", conn); return conn; diff --git a/legacy/edbus/src/lib/edbus_freedesktop.c b/legacy/edbus/src/lib/edbus_freedesktop.c index 50f050637a..8698890b87 100644 --- a/legacy/edbus/src/lib/edbus_freedesktop.c +++ b/legacy/edbus/src/lib/edbus_freedesktop.c @@ -8,7 +8,7 @@ edbus_name_request(EDBus_Connection *conn, const char *name, unsigned int flags, EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - return edbus_proxy_call(conn->daemon, "RequestName", cb, + return edbus_proxy_call(conn->fdo_proxy, "RequestName", cb, cb_data, -1, "su", name, flags); } @@ -18,7 +18,7 @@ edbus_name_release(EDBus_Connection *conn, const char *name, EDBus_Message_Cb cb EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - return edbus_proxy_call(conn->daemon, "ReleaseName", cb, + return edbus_proxy_call(conn->fdo_proxy, "ReleaseName", cb, cb_data, -1, "s", name); } @@ -28,7 +28,7 @@ edbus_name_owner_get(EDBus_Connection *conn, const char *name, EDBus_Message_Cb EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - return edbus_proxy_call(conn->daemon, "GetNameOwner", cb, + return edbus_proxy_call(conn->fdo_proxy, "GetNameOwner", cb, cb_data, -1, "s", name); } @@ -38,7 +38,7 @@ edbus_name_owner_has(EDBus_Connection *conn, const char *name, EDBus_Message_Cb EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - return edbus_proxy_call(conn->daemon, "NameHasOwner", cb, + return edbus_proxy_call(conn->fdo_proxy, "NameHasOwner", cb, cb_data, -1, "s", name); } @@ -47,7 +47,7 @@ edbus_names_list(EDBus_Connection *conn, EDBus_Message_Cb cb, const void *cb_dat { EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - return edbus_proxy_call(conn->daemon, "ListNames", cb, + return edbus_proxy_call(conn->fdo_proxy, "ListNames", cb, cb_data, -1, ""); } @@ -56,7 +56,7 @@ edbus_names_activatable_list(EDBus_Connection *conn, EDBus_Message_Cb cb, const { EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); - return edbus_proxy_call(conn->daemon, "ListActivatableNames", cb, + return edbus_proxy_call(conn->fdo_proxy, "ListActivatableNames", cb, cb_data, -1, ""); } @@ -66,7 +66,7 @@ edbus_name_start(EDBus_Connection *conn, const char *name, unsigned int flags, E EINA_SAFETY_ON_NULL_RETURN_VAL(conn, NULL); EINA_SAFETY_ON_NULL_RETURN_VAL(name, NULL); - return edbus_proxy_call(conn->daemon, "StartServiceByName", cb, + return edbus_proxy_call(conn->fdo_proxy, "StartServiceByName", cb, cb_data, -1, "su", name, flags); } diff --git a/legacy/edbus/src/lib/edbus_private_types.h b/legacy/edbus/src/lib/edbus_private_types.h index 4c3d86fd62..13f72f7cf4 100644 --- a/legacy/edbus/src/lib/edbus_private_types.h +++ b/legacy/edbus/src/lib/edbus_private_types.h @@ -61,7 +61,7 @@ struct _EDBus_Connection Ecore_Idler *idler; EDBus_Connection_Context_Event event_handlers[EDBUS_CONNECTION_EVENT_LAST]; Eina_Inlist *root_objs;//service_object - EDBus_Proxy *daemon; + EDBus_Proxy *fdo_proxy; }; struct _EDBus_Object