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

edbus: rename and yodafy functions 

SVN revision: 82902
This commit is contained in:
Lucas De Marchi 2013-01-16 21:17:06 +00:00
parent fadeb72831
commit 15cbe4a60d
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/edbus/edbus_service.c
View File

@ -706,7 +706,7 @@ struct iface_remove_data {
}; };
static Eina_Bool static Eina_Bool
_iface_changed_send(void *data) _object_manager_changes_process(void *data)
{ {
EDBus_Service_Object *parent = data; EDBus_Service_Object *parent = data;
@ -801,13 +801,13 @@ error2:
} }
static EDBus_Service_Object * static EDBus_Service_Object *
_find_object_manager_parent(EDBus_Service_Object *obj) _object_manager_parent_find(EDBus_Service_Object *obj)
{ {
if (!obj->parent) if (!obj->parent)
return NULL; return NULL;
if (obj->parent->has_objectmanager) if (obj->parent->has_objectmanager)
return obj->parent; return obj->parent;
return _find_object_manager_parent(obj->parent); return _object_manager_parent_find(obj->parent);
} }
static EDBus_Service_Interface * static EDBus_Service_Interface *
@ -829,12 +829,12 @@ _edbus_service_interface_add(EDBus_Service_Object *obj, const char *interface)
iface->obj = obj; iface->obj = obj;
eina_hash_add(obj->interfaces, iface->name, iface); eina_hash_add(obj->interfaces, iface->name, iface);
parent = _find_object_manager_parent(obj); parent = _object_manager_parent_find(obj);
if (parent) if (parent)
{ {
if (!parent->idler_iface_changed) if (!parent->idler_iface_changed)
parent->idler_iface_changed = ecore_idler_add(_iface_changed_send, parent->idler_iface_changed = ecore_idler_add(
parent); _object_manager_changes_process, parent);
parent->iface_added = eina_list_append(parent->iface_added, iface); parent->iface_added = eina_list_append(parent->iface_added, iface);
} }
return iface; return iface;
@ -1013,7 +1013,7 @@ _interface_free(EDBus_Service_Interface *interface)
if (interface->prop_invalidated) if (interface->prop_invalidated)
eina_array_free(interface->prop_invalidated); eina_array_free(interface->prop_invalidated);
parent = _find_object_manager_parent(interface->obj); parent = _object_manager_parent_find(interface->obj);
if (parent) if (parent)
{ {
struct iface_remove_data *data; struct iface_remove_data *data;
@ -1024,8 +1024,10 @@ _interface_free(EDBus_Service_Interface *interface)
data->iface = eina_stringshare_add(interface->name); data->iface = eina_stringshare_add(interface->name);
if (!parent->idler_iface_changed) if (!parent->idler_iface_changed)
parent->idler_iface_changed = ecore_idler_add(_iface_changed_send, {
parent); parent->idler_iface_changed = ecore_idler_add(
_object_manager_changes_process, parent);
}
parent->iface_removed = eina_list_append(parent->iface_removed, data); parent->iface_removed = eina_list_append(parent->iface_removed, data);
parent->iface_added = eina_list_remove(parent->iface_added, interface); parent->iface_added = eina_list_remove(parent->iface_added, interface);
} }