summaryrefslogtreecommitdiff
path: root/src/examples/eldbus
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2016-03-11 12:24:05 +0000
committerTom Hacohen <tom@stosb.com>2016-03-11 12:29:03 +0000
commit15646cf5e639bdd4309a2b215f394436f652d2d1 (patch)
treef072839fb79ef4e814242350fa228657c6d446fb /src/examples/eldbus
parent72c623603830557b9582774e5e9575629036007d (diff)
Revert "Fix examples according to the recent eo event changes."
This reverts commit d2fba6c5959f82f35984167131d3b67207780f48.
Diffstat (limited to 'src/examples/eldbus')
-rw-r--r--src/examples/eldbus/dbusmodel.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/src/examples/eldbus/dbusmodel.c b/src/examples/eldbus/dbusmodel.c
index ec37309..3e4063e 100644
--- a/src/examples/eldbus/dbusmodel.c
+++ b/src/examples/eldbus/dbusmodel.c
@@ -14,9 +14,11 @@
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, const Eo_Event *event) 17_event_interface_load_status_cb(void *data EINA_UNUSED, Eo *model,
18 const Eo_Event_Description *desc EINA_UNUSED,
19 void *event_info)
18{ 20{
19 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info; 21 Efl_Model_Load *actual_load = (Efl_Model_Load*)event_info;
20 Eina_Array *properties_list; 22 Eina_Array *properties_list;
21 Eina_Array_Iterator iterator; 23 Eina_Array_Iterator iterator;
22 Eina_Value const* property_value; 24 Eina_Value const* property_value;
@@ -27,8 +29,8 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
27 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) 29 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status)
28 return EINA_TRUE; 30 return EINA_TRUE;
29 31
30 name = eldbus_model_proxy_name_get(event->obj); 32 name = eldbus_model_proxy_name_get(model);
31 efl_model_properties_get(event->obj, &properties_list); 33 efl_model_properties_get(model, &properties_list);
32 34
33 printf(" -> %s\n", name); 35 printf(" -> %s\n", name);
34 if (eina_array_count(properties_list)) 36 if (eina_array_count(properties_list))
@@ -36,7 +38,7 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
36 38
37 EINA_ARRAY_ITER_NEXT(properties_list, i, property, iterator) 39 EINA_ARRAY_ITER_NEXT(properties_list, i, property, iterator)
38 { 40 {
39 efl_model_property_get(event->obj, property, &property_value); 41 efl_model_property_get(model, property, &property_value);
40 if (property_value) 42 if (property_value)
41 { 43 {
42 prop_str = eina_value_to_string(property_value); 44 prop_str = eina_value_to_string(property_value);
@@ -55,9 +57,11 @@ _event_interface_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
55} 57}
56 58
57static Eina_Bool 59static Eina_Bool
58_event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event) 60_event_load_status_cb(void *data EINA_UNUSED, Eo *model,
61 const Eo_Event_Description *desc EINA_UNUSED,
62 void *event_info)
59{ 63{
60 Efl_Model_Load *actual_load = (Efl_Model_Load*)event->event_info; 64 Efl_Model_Load *actual_load = (Efl_Model_Load*)event_info;
61 Eina_Accessor *accessor; 65 Eina_Accessor *accessor;
62 Eo *child = NULL; 66 Eo *child = NULL;
63 unsigned int i; 67 unsigned int i;
@@ -65,7 +69,7 @@ _event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
65 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status) 69 if (EFL_MODEL_LOAD_STATUS_LOADED != actual_load->status)
66 return EINA_TRUE; 70 return EINA_TRUE;
67 71
68 efl_model_children_count_get(event->obj, &children_count); 72 efl_model_children_count_get(model, &children_count);
69 if (children_count == 0) 73 if (children_count == 0)
70 { 74 {
71 printf("Don't find Interfaces\n"); 75 printf("Don't find Interfaces\n");
@@ -73,7 +77,7 @@ _event_load_status_cb(void *data EINA_UNUSED, const Eo_Event *event)
73 return EINA_FALSE; 77 return EINA_FALSE;
74 } 78 }
75 79
76 efl_model_children_slice_get(event->obj, 0, 0, &accessor); 80 efl_model_children_slice_get(model, 0, 0, &accessor);
77 printf("\nInterfaces:\n"); 81 printf("\nInterfaces:\n");
78 EINA_ACCESSOR_FOREACH(accessor, i, child) 82 EINA_ACCESSOR_FOREACH(accessor, i, child)
79 { 83 {