summaryrefslogtreecommitdiff
path: root/src/lib/eldbus
diff options
context:
space:
mode:
authorVitor Sousa <vitorsousasilva@gmail.com>2016-08-22 19:40:39 -0300
committerVitor Sousa <vitorsousasilva@gmail.com>2016-08-26 15:45:07 -0300
commit8356b16a49d4f653d61940763eff947466b44e24 (patch)
treeb5d8e533b3df4ad45f2ea97071b7a826ae5d04b5 /src/lib/eldbus
parent6b3ca899e8a60642466ddb6d7c7574b0c3ad9d9c (diff)
Efl Object: remove legacy callback calls from event_callback_call
Efl.Object.event_callback_call no longer calls legacy smart callbacks; calling only event callbacks registered with the given event description pointer. Create the method Efl.Object.event_callback_legacy_call to inherit the old behavior from Efl.Object.event_callback_call, calling both Efl.Object events and legacy smart callbacks. Update all other files accordingly in order to still supply legacy callbacks while they are necessary.
Diffstat (limited to 'src/lib/eldbus')
-rw-r--r--src/lib/eldbus/eldbus_model_arguments.c2
-rw-r--r--src/lib/eldbus/eldbus_model_connection.c2
-rw-r--r--src/lib/eldbus/eldbus_model_method.c2
-rw-r--r--src/lib/eldbus/eldbus_model_proxy.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/eldbus/eldbus_model_arguments.c b/src/lib/eldbus/eldbus_model_arguments.c
index f9f7f51c47..b78409194e 100644
--- a/src/lib/eldbus/eldbus_model_arguments.c
+++ b/src/lib/eldbus/eldbus_model_arguments.c
@@ -290,7 +290,7 @@ eldbus_model_arguments_process_arguments(Eldbus_Model_Arguments_Data *pd,
290 if (eina_array_count(changed_properties)) 290 if (eina_array_count(changed_properties))
291 { 291 {
292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties}; 292 Efl_Model_Property_Event evt = {.changed_properties = changed_properties};
293 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 293 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
294 } 294 }
295 295
296 result = EINA_TRUE; 296 result = EINA_TRUE;
diff --git a/src/lib/eldbus/eldbus_model_connection.c b/src/lib/eldbus/eldbus_model_connection.c
index 465673ad33..558cb85acd 100644
--- a/src/lib/eldbus/eldbus_model_connection.c
+++ b/src/lib/eldbus/eldbus_model_connection.c
@@ -341,7 +341,7 @@ _eldbus_model_connection_names_list_cb(void *data,
341 count = eina_list_count(pd->children_list); 341 count = eina_list_count(pd->children_list);
342 342
343 if (count) 343 if (count)
344 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count); 344 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_CHILDREN_COUNT_CHANGED, &count);
345 345
346 pd->is_listed = EINA_TRUE; 346 pd->is_listed = EINA_TRUE;
347 347
diff --git a/src/lib/eldbus/eldbus_model_method.c b/src/lib/eldbus/eldbus_model_method.c
index e36f941a0d..5adc31b5e6 100644
--- a/src/lib/eldbus/eldbus_model_method.c
+++ b/src/lib/eldbus/eldbus_model_method.c
@@ -95,7 +95,7 @@ _eldbus_model_method_call_cb(void *data, const Eldbus_Message *msg, Eldbus_Pendi
95 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS); 95 Eldbus_Model_Arguments_Data *args_data = efl_data_scope_get(pd->obj, ELDBUS_MODEL_ARGUMENTS_CLASS);
96 96
97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending)) 97 if (eldbus_model_arguments_process_arguments(args_data, msg, pending))
98 efl_event_callback_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL); 98 efl_event_callback_legacy_call(pd->obj, ELDBUS_MODEL_METHOD_EVENT_SUCCESSFUL_CALL, NULL);
99} 99}
100 100
101#include "eldbus_model_method.eo.c" 101#include "eldbus_model_method.eo.c"
diff --git a/src/lib/eldbus/eldbus_model_proxy.c b/src/lib/eldbus/eldbus_model_proxy.c
index 54eb6c667a..0b5ba49fd5 100644
--- a/src/lib/eldbus/eldbus_model_proxy.c
+++ b/src/lib/eldbus/eldbus_model_proxy.c
@@ -620,7 +620,7 @@ _eldbus_model_proxy_property_get_all_cb(void *data,
620 .changed_properties = changed_properties 620 .changed_properties = changed_properties
621 }; 621 };
622 622
623 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 623 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
624 } 624 }
625 625
626 eina_array_free(changed_properties); 626 eina_array_free(changed_properties);
@@ -686,7 +686,7 @@ _eldbus_model_proxy_property_set_cb(void *data,
686 .changed_properties = pd->properties_array 686 .changed_properties = pd->properties_array
687 }; 687 };
688 688
689 efl_event_callback_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt); 689 efl_event_callback_legacy_call(pd->obj, EFL_MODEL_EVENT_PROPERTIES_CHANGED, &evt);
690 efl_model_property_changed_notify(pd->obj, property_set_data->property); 690 efl_model_property_changed_notify(pd->obj, property_set_data->property);
691 691
692 } 692 }