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

edbus: Fix reply to GetManagedObjects containing bogus interface 

If ther interface was just added on this mainloop iteration we shouldn't
put it in the reply to GetManagedObjects because we still didn't send
the InterfacesAdded signal for that interface.



SVN revision: 82906
This commit is contained in:
Lucas De Marchi 2013-01-16 21:18:02 +00:00
parent 3c308503ea
commit 57ac8b0b95
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,7 +502,7 @@ _managed_obj_append(EDBus_Service_Object *obj, EDBus_Message_Iter *array, Eina_B
{
EDBus_Message_Iter *obj_entry, *array_interface;
Eina_Iterator *iface_iter;
EDBus_Service_Interface *children_iface;
EDBus_Service_Interface *iface;
EDBus_Service_Object *children;
if (first) goto foreach;
@ -510,19 +510,19 @@ _managed_obj_append(EDBus_Service_Object *obj, EDBus_Message_Iter *array, Eina_B
edbus_message_iter_arguments_append(array, "{oa{sa{sv}}}", &obj_entry);
edbus_message_iter_arguments_append(obj_entry, "oa{sa{sv}}", obj->path,
&array_interface);
&array_interface);
iface_iter = eina_hash_iterator_data_new(obj->interfaces);
/*
* FIXME: we shouldn't reply with an interface that is still in iface_added,
* otherwise after calling this method the user will still receive the signal
* that the interface was created
*/
EINA_ITERATOR_FOREACH(iface_iter, children_iface)
EINA_ITERATOR_FOREACH(iface_iter, iface)
{
Eina_Bool ret;
ret = _propmgr_iface_props_append(children_iface, array_interface);
if (ret) continue;
if (eina_list_data_find(obj->iface_added, iface))
continue;
ret = _propmgr_iface_props_append(iface, array_interface);
if (ret)
continue;
eina_iterator_free(iface_iter);
return EINA_FALSE;