summaryrefslogtreecommitdiff
path: root/src/lib/eldbus/eldbus_model_object.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/eldbus/eldbus_model_object.c')
-rw-r--r--src/lib/eldbus/eldbus_model_object.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/eldbus/eldbus_model_object.c b/src/lib/eldbus/eldbus_model_object.c
index 115330e..240d657e7 100644
--- a/src/lib/eldbus/eldbus_model_object.c
+++ b/src/lib/eldbus/eldbus_model_object.c
@@ -26,7 +26,7 @@ static void _eldbus_model_object_create_children(Eldbus_Model_Object_Data *, Eld
26static Eo_Base* 26static Eo_Base*
27_eldbus_model_object_eo_base_constructor(Eo *obj, Eldbus_Model_Object_Data *pd) 27_eldbus_model_object_eo_base_constructor(Eo *obj, Eldbus_Model_Object_Data *pd)
28{ 28{
29 obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor()); 29 obj = eo_constructor(eo_super(obj, MY_CLASS));
30 30
31 pd->obj = obj; 31 pd->obj = obj;
32 pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED; 32 pd->load.status = EFL_MODEL_LOAD_STATUS_UNLOADED;
@@ -90,7 +90,7 @@ _eldbus_model_object_eo_base_destructor(Eo *obj, Eldbus_Model_Object_Data *pd)
90 90
91 _eldbus_model_object_clear(pd); 91 _eldbus_model_object_clear(pd);
92 92
93 eo_do_super(obj, MY_CLASS, eo_destructor()); 93 eo_destructor(eo_super(obj, MY_CLASS));
94} 94}
95 95
96static Efl_Model_Load_Status 96static Efl_Model_Load_Status
@@ -462,7 +462,7 @@ _eldbus_model_object_introspect_cb(void *data,
462 462
463 count = eina_list_count(pd->children_list); 463 count = eina_list_count(pd->children_list);
464 if (count) 464 if (count)
465 eo_do(pd->obj, eo_event_callback_call(EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count)); 465 eo_event_callback_call(pd->obj, EFL_MODEL_BASE_EVENT_CHILDREN_COUNT_CHANGED, &count);
466 } 466 }
467} 467}
468 468
@@ -532,8 +532,7 @@ _eldbus_model_object_create_children(Eldbus_Model_Object_Data *pd, Eldbus_Object
532 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name); 532 WRN("(%p) Creating child: bus = %s, path = %s, interface = %s", pd->obj, pd->bus, current_path, interface->name);
533 533
534 // TODO: increment reference to keep 'interface' in memory 534 // TODO: increment reference to keep 'interface' in memory
535 child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, 535 child = eo_add_ref(ELDBUS_MODEL_PROXY_CLASS, NULL, eldbus_model_proxy_constructor(eoid, object, interface));
536 eldbus_model_proxy_constructor(object, interface));
537 536
538 pd->children_list = eina_list_append(pd->children_list, child); 537 pd->children_list = eina_list_append(pd->children_list, child);
539 } 538 }