summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_atspi_bridge.c
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-02-13 10:55:46 +0100
committerLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-02-13 10:55:46 +0100
commit9a02df65ae0f8557a12fbf7153eb60c7c2c8efbf (patch)
tree051b844a25845fb4580f8806ed73a619e47f79a2 /src/lib/elementary/elm_atspi_bridge.c
parent9eddc547c36070131fb73461c3d3948d345680b1 (diff)
efl_access: restore Efl.Access.Object.access_parent property
There are two main resons of restoring this property: * the efl_provider_find assumes that function should walk up Efl.Object parent-child hierarchy in order to find class implementor. However because access uses mostly custom made hierarchy instead of Efl.Object, the overriding implementation should break function spec. * improved readablity since it pairs well with already existing access_children property
Diffstat (limited to '')
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index e75f935a71..261681f7fb 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -2091,7 +2091,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2091 } 2091 }
2092 else if (!strcmp(property, "Parent")) 2092 else if (!strcmp(property, "Parent"))
2093 { 2093 {
2094 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2094 ret_obj = efl_access_object_access_parent_get(obj);
2095 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; 2095 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
2096 role = efl_access_object_role_get(obj); 2096 role = efl_access_object_role_get(obj);
2097 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) 2097 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
@@ -2818,7 +2818,7 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
2818 2818
2819 /* Get the current nodes index in it's parent and the parent object. */ 2819 /* Get the current nodes index in it's parent and the parent object. */
2820 indexinparent = efl_access_object_index_in_parent_get(obj); 2820 indexinparent = efl_access_object_index_in_parent_get(obj);
2821 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2821 parent = efl_access_object_access_parent_get(obj);
2822 2822
2823 if ((indexinparent > 0) && ((max == 0) || (count < max))) 2823 if ((indexinparent > 0) && ((max == 0) || (count < max)))
2824 { 2824 {
@@ -2874,7 +2874,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
2874 while ((max == 0 || count < max) && obj && obj != collection) 2874 while ((max == 0 || count < max) && obj && obj != collection)
2875 { 2875 {
2876 Eo *parent; 2876 Eo *parent;
2877 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2877 parent = efl_access_object_access_parent_get(obj);
2878 idx = efl_access_object_index_in_parent_get(obj); 2878 idx = efl_access_object_index_in_parent_get(obj);
2879 count = _collection_sort_order_canonical(rule, list, count, max, parent, 2879 count = _collection_sort_order_canonical(rule, list, count, max, parent,
2880 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); 2880 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
@@ -2952,7 +2952,7 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
2952 break; 2952 break;
2953 case ATSPI_Collection_TREE_RESTRICT_CHILDREN: 2953 case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
2954 idx = efl_access_object_index_in_parent_get(current); 2954 idx = efl_access_object_index_in_parent_get(current);
2955 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN); 2955 parent = efl_access_object_access_parent_get(current);
2956 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); 2956 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
2957 break; 2957 break;
2958 case ATSPI_Collection_TREE_RESTRICT_SIBLING: 2958 case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -3013,7 +3013,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
3013 Eo *collection = obj; 3013 Eo *collection = obj;
3014 3014
3015 if (limit) 3015 if (limit)
3016 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 3016 collection = efl_access_object_access_parent_get(obj);
3017 3017
3018 switch (tree) 3018 switch (tree)
3019 { 3019 {
@@ -3215,7 +3215,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3215 _bridge_iter_object_reference_append(bridge, iter_struct, root); 3215 _bridge_iter_object_reference_append(bridge, iter_struct, root);
3216 3216
3217 Eo *parent = NULL; 3217 Eo *parent = NULL;
3218 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN); 3218 parent = efl_access_object_access_parent_get(data);
3219 /* Marshall parent */ 3219 /* Marshall parent */
3220 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) 3220 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
3221 _object_desktop_reference_append(iter_struct); 3221 _object_desktop_reference_append(iter_struct);