kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edbus: Better naming for FDO proxy in connection 

Patch by: Lucas De Marchi <lucas.de.marchi@gmail.com>



SVN revision: 80707
This commit is contained in:
Lucas De Marchi 2012-12-11 19:52:02 +00:00 committed by Lucas De Marchi
parent d05347bb91
commit cbc0a8311a
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edbus/src/lib/edbus_core.c
View File

@ -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;

14
legacy/edbus/src/lib/edbus_freedesktop.c
View File

@ -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);
}

2
legacy/edbus/src/lib/edbus_private_types.h
View File

@ -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