summaryrefslogtreecommitdiff
path: root/src/examples/eldbus
diff options
context:
space:
mode:
authorDaniel Zaoui <daniel.zaoui@samsung.com>2016-03-29 09:26:50 +0300
committerDaniel Zaoui <daniel.zaoui@samsung.com>2016-03-29 09:49:52 +0300
commit32c136d84c3c43eccc2c6289aed065d9f30b589a (patch)
treed0e834dfda1f49348157e4d35a6f456d6f0988b3 /src/examples/eldbus
parentcaa999c5f9c9d118cee3e5b315ade9e93ad95f70 (diff)
Examples: remind Tom to compile before pushing
He will spank me for the commit message!!!
Diffstat (limited to 'src/examples/eldbus')
-rw-r--r--src/examples/eldbus/dbusmodel.c22
1 files changed, 9 insertions, 13 deletions
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index 3585fad..e9a3739 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -14,11 +14,9 @@
14static unsigned int children_count = 0; 14static unsigned int children_count = 0;
15 15
16static Eina_Bool 16static Eina_Bool
17_event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model, 17_event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
18 const Eo_Event_Description *desc EINA_UNUSED,
19 void *event_info)
20{ 18{
21 Efl_Model_Load *actual_load = (Efl_Model_Load*)event_info; 19 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
22 Eina_Array *properties_list; 20 Eina_Array *properties_list;
23 Eina_Array_Iterator iterator; 21 Eina_Array_Iterator iterator;
24 Eina_Value const* property_value; 22 Eina_Value const* property_value;
@@ -29,8 +27,8 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model,
29 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) 27 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status)
30 return EINA_TRUE; 28 return EINA_TRUE;
31 29
32 name = eldbus_model_proxy_name_get(model); 30 name = eldbus_model_proxy_name_get(event->obj);
33 efl_model_properties_get(model, &properties_list); 31 efl_model_properties_get(event->obj, &properties_list);
34 32
35 printf(" -> %s\n", name); 33 printf(" -> %s\n", name);
36 if (eina_array_count(properties_list)) 34 if (eina_array_count(properties_list))
@@ -38,7 +36,7 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model,
38 36
39 EINA_ARRAY_ITER_NEXT(properties_list, i, property, iterator) 37 EINA_ARRAY_ITER_NEXT(properties_list, i, property, iterator)
40 { 38 {
41 efl_model_property_get(model, property, &property_value); 39 efl_model_property_get(event->obj, property, &property_value);
42 if (property_value) 40 if (property_value)
43 { 41 {
44 prop_str = eina_value_to_string(property_value); 42 prop_str = eina_value_to_string(property_value);
@@ -57,11 +55,9 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model,
57} 55}
58 56
59static Eina_Bool 57static Eina_Bool
60_event_load_status_cb(void *data EINA_UNUSED, Eo *model, 58_event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
61 const Eo_Event_Description *desc EINA_UNUSED,
62 void *event_info)
63{ 59{
64 Efl_Model_Load *actual_load = (Efl_Model_Load*)event_info; 60 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info;
65 Eina_Accessor *accessor; 61 Eina_Accessor *accessor;
66 Eo *child = NULL; 62 Eo *child = NULL;
67 unsigned int i; 63 unsigned int i;
@@ -69,7 +65,7 @@ _event_load_status_cb(void *data EINA_UNUSED, Eo *model,
69 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) 65 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status)
70 return EINA_TRUE; 66 return EINA_TRUE;
71 67
72 efl_model_children_count_get(model, &children_count); 68 efl_model_children_count_get(event->obj, &children_count);
73 if (children_count == 0) 69 if (children_count == 0)
74 { 70 {
75 printf("Don't find Interfaces\n"); 71 printf("Don't find Interfaces\n");
@@ -77,7 +73,7 @@ _event_load_status_cb(void *data EINA_UNUSED, Eo *model,
77 return EINA_FALSE; 73 return EINA_FALSE;
78 } 74 }
79 75
80 efl_model_children_slice_get(model, 0, 0, &accessor); 76 efl_model_children_slice_get(event->obj, 0, 0, &accessor);
81 printf("\nInterfaces:\n"); 77 printf("\nInterfaces:\n");
82 EINA_ACCESSOR_FOREACH(accessor, i, child) 78 EINA_ACCESSOR_FOREACH(accessor, i, child)
83 { 79 {