summaryrefslogtreecommitdiff
path: root/src/lib/elementary/elm_atspi_bridge.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/elementary/elm_atspi_bridge.c')
-rw-r--r--src/lib/elementary/elm_atspi_bridge.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c
index cca6176..833d5be 100644
--- a/src/lib/elementary/elm_atspi_bridge.c
+++ b/src/lib/elementary/elm_atspi_bridge.c
@@ -487,7 +487,7 @@ _accessible_get_role(const Eldbus_Service_Interface *iface, const Eldbus_Message
487 AtspiRole atspi_role = ATSPI_ROLE_INVALID; 487 AtspiRole atspi_role = ATSPI_ROLE_INVALID;
488 Efl_Access_Role role; 488 Efl_Access_Role role;
489 489
490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 490 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
491 491
492 role = efl_access_object_role_get(obj); 492 role = efl_access_object_role_get(obj);
493 493
@@ -506,7 +506,7 @@ _accessible_get_role_name(const Eldbus_Service_Interface *iface, const Eldbus_Me
506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 506 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
507 Eo *obj = _bridge_object_from_path(bridge, obj_path); 507 Eo *obj = _bridge_object_from_path(bridge, obj_path);
508 508
509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 509 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
510 510
511 role_name = efl_access_object_role_name_get(obj); 511 role_name = efl_access_object_role_name_get(obj);
512 512
@@ -524,7 +524,7 @@ _accessible_get_localized_role_name(const Eldbus_Service_Interface *iface, const
524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 524 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
525 Eo *obj = _bridge_object_from_path(bridge, obj_path); 525 Eo *obj = _bridge_object_from_path(bridge, obj_path);
526 526
527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 527 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
528 528
529 l_role_name = efl_access_object_localized_role_name_get(obj); 529 l_role_name = efl_access_object_localized_role_name_get(obj);
530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL); 530 EINA_SAFETY_ON_NULL_RETURN_VAL(l_role_name, NULL);
@@ -547,7 +547,7 @@ _accessible_get_children(const Eldbus_Service_Interface *iface, const Eldbus_Mes
547 Eldbus_Message_Iter *iter, *iter_array; 547 Eldbus_Message_Iter *iter, *iter_array;
548 Eo *children; 548 Eo *children;
549 549
550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 550 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
551 551
552 children_list = efl_access_object_access_children_get(obj); 552 children_list = efl_access_object_access_children_get(obj);
553 553
@@ -582,13 +582,13 @@ _accessible_get_application(const Eldbus_Service_Interface *iface, const Eldbus_
582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 582 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path); 583 Eo *root, *obj = _bridge_object_from_path(bridge, obj_path);
584 584
585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 585 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
586 586
587 ret = eldbus_message_method_return_new(msg); 587 ret = eldbus_message_method_return_new(msg);
588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 588 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
589 589
590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret); 590 Eldbus_Message_Iter *iter = eldbus_message_iter_get(ret);
591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 591 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
592 _bridge_iter_object_reference_append(bridge, iter, root); 592 _bridge_iter_object_reference_append(bridge, iter, root);
593 593
594 return ret; 594 return ret;
@@ -606,7 +606,7 @@ _accessible_attributes_get(const Eldbus_Service_Interface *iface, const Eldbus_M
606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 606 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
607 Eo *obj = _bridge_object_from_path(bridge, obj_path); 607 Eo *obj = _bridge_object_from_path(bridge, obj_path);
608 608
609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 609 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
610 610
611 ret = eldbus_message_method_return_new(msg); 611 ret = eldbus_message_method_return_new(msg);
612 if (!ret) goto error; 612 if (!ret) goto error;
@@ -648,7 +648,7 @@ _accessible_interfaces_get(const Eldbus_Service_Interface *iface, const Eldbus_M
648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 648 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
649 Eo *obj = _bridge_object_from_path(bridge, obj_path); 649 Eo *obj = _bridge_object_from_path(bridge, obj_path);
650 650
651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 651 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
652 652
653 ret = eldbus_message_method_return_new(msg); 653 ret = eldbus_message_method_return_new(msg);
654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 654 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -718,7 +718,7 @@ _accessible_get_state(const Eldbus_Service_Interface *iface, const Eldbus_Messag
718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME); 718 Eo *bridge = eldbus_service_object_data_get(iface, ELM_ATSPI_BRIDGE_CLASS_NAME);
719 Eo *obj = _bridge_object_from_path(bridge, obj_path); 719 Eo *obj = _bridge_object_from_path(bridge, obj_path);
720 720
721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 721 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
722 722
723 ret = eldbus_message_method_return_new(msg); 723 ret = eldbus_message_method_return_new(msg);
724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 724 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -754,7 +754,7 @@ _accessible_get_index_in_parent(const Eldbus_Service_Interface *iface EINA_UNUSE
754 Eldbus_Message *ret; 754 Eldbus_Message *ret;
755 int idx = -1; 755 int idx = -1;
756 756
757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 757 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
758 758
759 ret = eldbus_message_method_return_new(msg); 759 ret = eldbus_message_method_return_new(msg);
760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 760 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -778,7 +778,7 @@ _accessible_child_at_index(const Eldbus_Service_Interface *iface EINA_UNUSED, co
778 Eldbus_Message *ret; 778 Eldbus_Message *ret;
779 Eldbus_Message_Iter *iter; 779 Eldbus_Message_Iter *iter;
780 780
781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 781 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
782 782
783 if (!eldbus_message_arguments_get(msg, "i", &idx)) 783 if (!eldbus_message_arguments_get(msg, "i", &idx))
784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 784 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -809,7 +809,7 @@ _accessible_get_relation_set(const Eldbus_Service_Interface *iface EINA_UNUSED,
809 Eina_List *l; 809 Eina_List *l;
810 Eina_Iterator *it; 810 Eina_Iterator *it;
811 811
812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 812 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
813 813
814 ret = eldbus_message_method_return_new(msg); 814 ret = eldbus_message_method_return_new(msg);
815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 815 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -1220,7 +1220,7 @@ _image_extents_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *
1220 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1220 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1221 Eina_Rect r; 1221 Eina_Rect r;
1222 1222
1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1223 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1224 1224
1225 if (!eldbus_message_arguments_get(msg, "u", &type)) 1225 if (!eldbus_message_arguments_get(msg, "u", &type))
1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1226 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1246,7 +1246,7 @@ _image_position_get(const Eldbus_Service_Interface *iface, const Eldbus_Message
1246 int x = -1, y = -1; 1246 int x = -1, y = -1;
1247 Eina_Bool screen_coords; 1247 Eina_Bool screen_coords;
1248 1248
1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1249 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1250 1250
1251 if (!eldbus_message_arguments_get(msg, "u", &type)) 1251 if (!eldbus_message_arguments_get(msg, "u", &type))
1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type."); 1252 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.InvalidArgs", "Invalid index type.");
@@ -1274,7 +1274,7 @@ _image_size_get(const Eldbus_Service_Interface *iface, const Eldbus_Message *msg
1274 Eo *obj = _bridge_object_from_path(bridge, obj_path); 1274 Eo *obj = _bridge_object_from_path(bridge, obj_path);
1275 int w = -1, h = -1; 1275 int w = -1, h = -1;
1276 1276
1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 1277 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
1278 1278
1279 ret = eldbus_message_method_return_new(msg); 1279 ret = eldbus_message_method_return_new(msg);
1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL); 1280 EINA_SAFETY_ON_NULL_RETURN_VAL(ret, NULL);
@@ -2028,7 +2028,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2028 tmp = path + len; /* Skip over the prefix */ 2028 tmp = path + len; /* Skip over the prefix */
2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp)) 2029 if (!strcmp(ELM_ACCESS_OBJECT_PATH_ROOT, tmp))
2030 { 2030 {
2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2031 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2032 return root; 2032 return root;
2033 } 2033 }
2034 2034
@@ -2042,7 +2042,7 @@ _bridge_object_from_path(Eo *bridge, const char *path)
2042 return NULL; 2042 return NULL;
2043 } 2043 }
2044 2044
2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_MIXIN) ? eo : NULL; 2045 ret = efl_isa(eo, EFL_ACCESS_OBJECT_CLASS) ? eo : NULL;
2046 2046
2047 return ret; 2047 return ret;
2048} 2048}
@@ -2055,7 +2055,7 @@ _path_from_object(const Eo *eo)
2055 2055
2056 if (!eo) 2056 if (!eo)
2057 return ATSPI_DBUS_PATH_NULL; 2057 return ATSPI_DBUS_PATH_NULL;
2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 2058 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
2059 2059
2060 if (eo == root) 2060 if (eo == root)
2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT); 2061 snprintf(path, sizeof(path), "%s%s", ELM_ACCESS_OBJECT_PATH_PREFIX, ELM_ACCESS_OBJECT_PATH_ROOT);
@@ -2073,7 +2073,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2073 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path); 2074 Eo *ret_obj = NULL, *obj = _bridge_object_from_path(bridge, obj_path);
2075 2075
2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2076 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2077 2077
2078 if (!strcmp(property, "Name")) 2078 if (!strcmp(property, "Name"))
2079 { 2079 {
@@ -2093,7 +2093,7 @@ _accessible_property_get(const Eldbus_Service_Interface *interface, const char *
2093 } 2093 }
2094 else if (!strcmp(property, "Parent")) 2094 else if (!strcmp(property, "Parent"))
2095 { 2095 {
2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2096 ret_obj = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID; 2097 Efl_Access_Role role = EFL_ACCESS_ROLE_INVALID;
2098 role = efl_access_object_role_get(obj); 2098 role = efl_access_object_role_get(obj);
2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role)) 2099 if ((!ret_obj) && (EFL_ACCESS_ROLE_APPLICATION == role))
@@ -2233,7 +2233,7 @@ _image_properties_get(const Eldbus_Service_Interface *interface, const char *pro
2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME); 2233 Eo *bridge = eldbus_service_object_data_get(interface, ELM_ATSPI_BRIDGE_CLASS_NAME);
2234 Eo *obj = _bridge_object_from_path(bridge, obj_path); 2234 Eo *obj = _bridge_object_from_path(bridge, obj_path);
2235 2235
2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, request_msg, error); 2236 ELM_ATSPI_PROPERTY_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, request_msg, error);
2237 2237
2238 if (!strcmp(property, "ImageDescription")) 2238 if (!strcmp(property, "ImageDescription"))
2239 { 2239 {
@@ -2820,7 +2820,7 @@ _collection_sort_order_reverse_canonical(struct collection_match_rule *rule, Ein
2820 2820
2821 /* Get the current nodes index in it's parent and the parent object. */ 2821 /* Get the current nodes index in it's parent and the parent object. */
2822 indexinparent = efl_access_object_index_in_parent_get(obj); 2822 indexinparent = efl_access_object_index_in_parent_get(obj);
2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2823 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2824 2824
2825 if ((indexinparent > 0) && ((max == 0) || (count < max))) 2825 if ((indexinparent > 0) && ((max == 0) || (count < max)))
2826 { 2826 {
@@ -2876,7 +2876,7 @@ _collection_inorder(Eo *collection, struct collection_match_rule *rule, Eina_Lis
2876 while ((max == 0 || count < max) && obj && obj != collection) 2876 while ((max == 0 || count < max) && obj && obj != collection)
2877 { 2877 {
2878 Eo *parent; 2878 Eo *parent;
2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 2879 parent = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
2880 idx = efl_access_object_index_in_parent_get(obj); 2880 idx = efl_access_object_index_in_parent_get(obj);
2881 count = _collection_sort_order_canonical(rule, list, count, max, parent, 2881 count = _collection_sort_order_canonical(rule, list, count, max, parent,
2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse); 2882 idx + 1, EINA_TRUE, NULL, EINA_TRUE, traverse);
@@ -2954,7 +2954,7 @@ _collection_get_matches_from_handle(Eo *collection, Eo *current, struct collecti
2954 break; 2954 break;
2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN: 2955 case ATSPI_Collection_TREE_RESTRICT_CHILDREN:
2956 idx = efl_access_object_index_in_parent_get(current); 2956 idx = efl_access_object_index_in_parent_get(current);
2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_MIXIN); 2957 parent = efl_provider_find(efl_parent_get(current), EFL_ACCESS_OBJECT_CLASS);
2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse); 2958 _collection_query(rule, sortby, &result, 0, max, parent, idx, EINA_FALSE, NULL, EINA_TRUE, traverse);
2959 break; 2959 break;
2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING: 2960 case ATSPI_Collection_TREE_RESTRICT_SIBLING:
@@ -2982,7 +2982,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2982 AtspiCollectionSortOrder sortby; 2982 AtspiCollectionSortOrder sortby;
2983 Eina_List *result = NULL; 2983 Eina_List *result = NULL;
2984 2984
2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 2985 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
2986 2986
2987 iter = eldbus_message_iter_get(msg); 2987 iter = eldbus_message_iter_get(msg);
2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 2988 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -2994,7 +2994,7 @@ _collection_get_matches_from(const Eldbus_Service_Interface *iface EINA_UNUSED,
2994 2994
2995 current = _bridge_object_from_path(bridge, obj_path); 2995 current = _bridge_object_from_path(bridge, obj_path);
2996 2996
2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 2997 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
2998 2998
2999 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 2999 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3000 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3015,7 +3015,7 @@ _collection_get_matches_to_handle(Eo *obj, Eo *current, struct collection_match_
3015 Eo *collection = obj; 3015 Eo *collection = obj;
3016 3016
3017 if (limit) 3017 if (limit)
3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_MIXIN); 3018 collection = efl_provider_find(efl_parent_get(obj), EFL_ACCESS_OBJECT_CLASS);
3019 3019
3020 switch (tree) 3020 switch (tree)
3021 { 3021 {
@@ -3054,7 +3054,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3054 Eina_List *result = NULL; 3054 Eina_List *result = NULL;
3055 Eina_Bool limit; 3055 Eina_Bool limit;
3056 3056
3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3057 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3058 3058
3059 iter = eldbus_message_iter_get(msg); 3059 iter = eldbus_message_iter_get(msg);
3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3060 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3066,7 +3066,7 @@ _collection_get_matches_to(const Eldbus_Service_Interface *iface EINA_UNUSED, co
3066 3066
3067 current = _bridge_object_from_path(bridge, obj_path); 3067 current = _bridge_object_from_path(bridge, obj_path);
3068 3068
3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_MIXIN, msg); 3069 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(current, EFL_ACCESS_OBJECT_CLASS, msg);
3070 3070
3071 if (!_collection_iter_match_rule_get(rule_iter, &rule)) 3071 if (!_collection_iter_match_rule_get(rule_iter, &rule))
3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters."); 3072 return eldbus_message_error_new(msg, "org.freedesktop.DBus.Error.Failed", "Invalid match rule parameters.");
@@ -3094,7 +3094,7 @@ _collection_get_matches(const Eldbus_Service_Interface *iface, const Eldbus_Mess
3094 AtspiCollectionSortOrder sortby; 3094 AtspiCollectionSortOrder sortby;
3095 Eina_List *result = NULL; 3095 Eina_List *result = NULL;
3096 3096
3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_MIXIN, msg); 3097 ELM_ATSPI_OBJ_CHECK_OR_RETURN_DBUS_ERROR(obj, EFL_ACCESS_OBJECT_CLASS, msg);
3098 3098
3099 iter = eldbus_message_iter_get(msg); 3099 iter = eldbus_message_iter_get(msg);
3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL); 3100 EINA_SAFETY_ON_NULL_RETURN_VAL(iter, NULL);
@@ -3168,7 +3168,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s"); 3168 iter_array = eldbus_message_iter_container_new(iter, 'a', "s");
3169 if (!iter_array) return; 3169 if (!iter_array) return;
3170 3170
3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3171 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3172 { 3172 {
3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE); 3173 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_ACCESSIBLE);
3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION); 3174 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COLLECTION);
@@ -3181,7 +3181,7 @@ _iter_interfaces_append(Eldbus_Message_Iter *iter, const Eo *obj)
3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT); 3181 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_COMPONENT);
3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE)) 3182 if (efl_isa(obj, EFL_ACCESS_EDITABLE_TEXT_INTERFACE))
3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT); 3183 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_EDITABLE_TEXT);
3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 3184 if (efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE); 3185 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_IMAGE);
3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE)) 3186 if (efl_isa(obj, EFL_ACCESS_SELECTION_INTERFACE))
3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION); 3187 eldbus_message_iter_basic_append(iter_array, 's', ATSPI_DBUS_INTERFACE_SELECTION);
@@ -3203,7 +3203,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3203 Efl_Access_State_Set states; 3203 Efl_Access_State_Set states;
3204 Efl_Access_Role role; 3204 Efl_Access_Role role;
3205 Eo *root; 3205 Eo *root;
3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3206 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3207 3207
3208 role = efl_access_object_role_get(data); 3208 role = efl_access_object_role_get(data);
3209 3209
@@ -3217,7 +3217,7 @@ _cache_item_reference_append_cb(Eo *bridge, Eo *data, Eldbus_Message_Iter *iter_
3217 _bridge_iter_object_reference_append(bridge, iter_struct, root); 3217 _bridge_iter_object_reference_append(bridge, iter_struct, root);
3218 3218
3219 Eo *parent = NULL; 3219 Eo *parent = NULL;
3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_MIXIN); 3220 parent = efl_provider_find(efl_parent_get(data), EFL_ACCESS_OBJECT_CLASS);
3221 /* Marshall parent */ 3221 /* Marshall parent */
3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role)) 3222 if ((!parent) && (EFL_ACCESS_ROLE_APPLICATION == role))
3223 _object_desktop_reference_append(iter_struct); 3223 _object_desktop_reference_append(iter_struct);
@@ -3300,7 +3300,7 @@ _cache_get_items(const Eldbus_Service_Interface *iface, const Eldbus_Message *ms
3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE); 3300 iter_array = eldbus_message_iter_container_new(iter, 'a', CACHE_ITEM_SIGNATURE);
3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail); 3301 EINA_SAFETY_ON_NULL_GOTO(iter_array, fail);
3302 3302
3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3303 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3304 to_process = eina_list_append(NULL, root); 3304 to_process = eina_list_append(NULL, root);
3305 3305
3306 while (to_process) 3306 while (to_process)
@@ -3705,7 +3705,7 @@ _elm_atspi_bridge_app_register(Eo *bridge)
3705 "Embed"); 3705 "Embed");
3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message); 3706 Eldbus_Message_Iter *iter = eldbus_message_iter_get(message);
3707 3707
3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3708 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3709 _bridge_iter_object_reference_append(bridge, iter, root); 3709 _bridge_iter_object_reference_append(bridge, iter, root);
3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1); 3710 eldbus_connection_send(pd->a11y_bus, message, _on_elm_atspi_bridge_app_register, NULL, -1);
3711 3711
@@ -3718,7 +3718,7 @@ _elm_atspi_bridge_app_unregister(Eo *bridge)
3718 Eo *root; 3718 Eo *root;
3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE); 3719 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN_VAL(bridge, pd, EINA_FALSE);
3720 3720
3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 3721 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
3722 3722
3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY, 3723 Eldbus_Message *message = eldbus_message_method_call_new(ATSPI_DBUS_NAME_REGISTRY,
3724 ATSPI_DBUS_PATH_ROOT, 3724 ATSPI_DBUS_PATH_ROOT,
@@ -4118,7 +4118,7 @@ static void _bridge_signal_send(Eo *bridge, Eo *obj, const char *infc, const Eld
4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4118 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4119 4119
4120 path = _path_from_object(obj); 4120 path = _path_from_object(obj);
4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_MIXIN); 4121 root = efl_access_object_access_root_get(EFL_ACCESS_OBJECT_CLASS);
4122 4122
4123 msg = eldbus_message_signal_new(path, infc, signal->name); 4123 msg = eldbus_message_signal_new(path, infc, signal->name);
4124 if (!msg) return; 4124 if (!msg) return;
@@ -4368,7 +4368,7 @@ _a11y_connection_shutdown(Eo *bridge)
4368 if (pd->event_hash) eina_hash_free(pd->event_hash); 4368 if (pd->event_hash) eina_hash_free(pd->event_hash);
4369 pd->event_hash = NULL; 4369 pd->event_hash = NULL;
4370 4370
4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_MIXIN, pd->event_hdlr); 4371 efl_access_object_event_handler_del(EFL_ACCESS_OBJECT_CLASS, pd->event_hdlr);
4372 pd->event_hdlr = NULL; 4372 pd->event_hdlr = NULL;
4373 4373
4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL); 4374 efl_event_callback_legacy_call(bridge, ELM_ATSPI_BRIDGE_EVENT_DISCONNECTED, NULL);
@@ -4460,7 +4460,7 @@ _a11y_bus_initialize(Eo *obj, const char *socket_addr)
4460 _elm_atspi_bridge_app_register(obj); 4460 _elm_atspi_bridge_app_register(obj);
4461 4461
4462 // register accessible object event listener 4462 // register accessible object event listener
4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_MIXIN, _bridge_accessible_event_dispatch, obj); 4463 pd->event_hdlr = efl_access_object_event_handler_add(EFL_ACCESS_OBJECT_CLASS, _bridge_accessible_event_dispatch, obj);
4464} 4464}
4465 4465
4466static void 4466static void
@@ -4538,7 +4538,7 @@ static void _bridge_object_register(Eo *bridge, Eo *obj)
4538{ 4538{
4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd); 4539 ELM_ATSPI_BRIDGE_DATA_GET_OR_RETURN(bridge, pd);
4540 4540
4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_MIXIN)) 4541 if (!efl_isa(obj, EFL_ACCESS_OBJECT_CLASS))
4542 { 4542 {
4543 WRN("Unable to register class w/o Efl_Access_Object!"); 4543 WRN("Unable to register class w/o Efl_Access_Object!");
4544 return; 4544 return;