elementary: remove type atspi api

12 files changed, 3 insertions, 116 deletions

diff --git a/src/lib/elementary/efl_ui_box.c b/src/lib/elementary/efl_ui_box.c
index 845061af00..6627ec1dce 100644
--- a/src/lib/elementary/efl_ui_box.c
+++ b/src/lib/elementary/efl_ui_box.c
@@ -226,7 +226,6 @@ _efl_ui_box_efl_canvas_group_group_del(Eo *obj, Efl_Ui_Box_Data *sd)
 EOLIAN static Eo *
 _efl_ui_box_efl_object_constructor(Eo *obj, Efl_Ui_Box_Data *pd)
 {
-   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 37f55f3f58..01a5fba23b 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -4273,7 +4273,6 @@ _elm_win_frame_add(Efl_Ui_Win_Data *sd, const char *element, const char *style)
                   efreet_desktop_free(d);
                }
           }
-        elm_interface_atspi_accessible_type_set(sd->icon, ELM_ATSPI_TYPE_DISABLED);
      }
 
    edje_object_part_swallow(sd->frame_obj, "elm.swallow.icon", sd->icon);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index f3098eaaa4..fb3a46dea2 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -774,8 +774,6 @@ _item_new(Elm_Multibuttonentry_Data *sd,
    ELM_MULTIBUTTONENTRY_ITEM_DATA_GET(eo_item, item);
    VIEW(item) = elm_layout_add(obj);
 
-   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_DISABLED);
-
    if (!elm_layout_theme_set
        (VIEW(item), "multibuttonentry", "btn", elm_widget_style_get(obj)))
      CRI("Failed to set layout!");
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 2b905523fa..060aecf496 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -33,11 +33,7 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U
 
    EINA_LIST_FOREACH(_elm_win_list, l, win)
      {
-        Elm_Atspi_Type type;
-        if (!efl_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
-          continue;
-        type = elm_interface_atspi_accessible_type_get(win);
-        if (type == ELM_ATSPI_TYPE_REGULAR)
+        if (efl_isa(win, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
           accs = eina_list_append(accs, win);
      }
 
diff --git a/src/lib/elementary/elm_bg.c b/src/lib/elementary/elm_bg.c
index 1d1667423c..ab6c1a6141 100644
--- a/src/lib/elementary/elm_bg.c
+++ b/src/lib/elementary/elm_bg.c
@@ -121,7 +121,6 @@ elm_bg_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_bg_efl_object_constructor(Eo *obj, Elm_Bg_Data *_pd EINA_UNUSED)
 {
-   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_DISABLED);
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
 
diff --git a/src/lib/elementary/elm_box.c b/src/lib/elementary/elm_box.c
index 7e1d1dc90e..1e3054b696 100644
--- a/src/lib/elementary/elm_box.c
+++ b/src/lib/elementary/elm_box.c
@@ -432,7 +432,6 @@ elm_box_add(Evas_Object *parent)
 EOLIAN static Eo *
 _elm_box_efl_object_constructor(Eo *obj, Elm_Box_Data *_pd EINA_UNUSED)
 {
-   elm_interface_atspi_accessible_type_set(obj, ELM_ATSPI_TYPE_SKIPPED);
    obj = efl_constructor(efl_super(obj, MY_CLASS));
    efl_canvas_object_type_set(obj, MY_CLASS_NAME_LEGACY);
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c
index 09ddea8ffe..c520e0d472 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.c
+++ b/src/lib/elementary/elm_interface_atspi_accessible.c
@@ -128,7 +128,6 @@ struct _Elm_Interface_Atspi_Accessible_Data
    const char    *description;
    const char    *translation_domain;
    Elm_Atspi_Relation_Set relations;
-   Elm_Atspi_Type type: 2;
 };
 
 typedef struct _Elm_Interface_Atspi_Accessible_Data Elm_Interface_Atspi_Accessible_Data;
@@ -168,18 +167,7 @@ _elm_interface_atspi_accessible_index_in_parent_get(Eo *obj, Elm_Interface_Atspi
 EOLIAN static Elm_Interface_Atspi_Accessible *
 _elm_interface_atspi_accessible_parent_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd EINA_UNUSED)
 {
-   Elm_Atspi_Type type;
-   Eo *parent = obj;
-
-   do {
-      parent = efl_parent_get(obj);
-      if (efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
-        {
-           type = elm_interface_atspi_accessible_type_get(parent);
-           if (type != ELM_ATSPI_TYPE_SKIPPED) break;
-        }
-   } while (parent);
-
+   Eo *parent = efl_parent_get(obj);
    return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
 }
 
@@ -315,7 +303,6 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
 {
    Eina_List *l;
    Elm_Atspi_Event_Handler *hdl;
-   Elm_Atspi_Type type;
 
    if (!accessible || !event || !efl_isa(accessible, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN))
      {
@@ -323,18 +310,6 @@ _elm_interface_atspi_accessible_event_emit(Eo *class EINA_UNUSED, void *pd EINA_
         return;
      }
 
-   type = elm_interface_atspi_accessible_type_get(accessible);
-   if (type != ELM_ATSPI_TYPE_REGULAR)
-     return;
-
-   if (event == ELM_INTERFACE_ATSPI_ACCESSIBLE_EVENT_CHILDREN_CHANGED)
-     {
-        Elm_Atspi_Event_Children_Changed_Data *atspi_data = event_info;
-        type = elm_interface_atspi_accessible_type_get(atspi_data->child);
-        if (type != ELM_ATSPI_TYPE_REGULAR)
-          return;
-     }
-
    Efl_Event ev;
    ev.object = accessible;
    ev.desc = event;
@@ -569,35 +544,6 @@ _elm_interface_atspi_accessible_root_get(Eo *class EINA_UNUSED, void *pd EINA_UN
    return root;
 }
 
-EOLIAN Elm_Atspi_Type
-_elm_interface_atspi_accessible_type_get(Eo *obj EINA_UNUSED, Elm_Interface_Atspi_Accessible_Data *pd)
-{
-   return pd->type;
-}
-
-EOLIAN void
-_elm_interface_atspi_accessible_type_set(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd, Elm_Atspi_Type val)
-{
-   Elm_Interface_Atspi_Accessible *parent;
-   if (val == pd->type)
-     return;
-
-   parent = elm_interface_atspi_accessible_parent_get(obj);
-
-   switch (val)
-     {
-      case ELM_ATSPI_TYPE_DISABLED:
-      case ELM_ATSPI_TYPE_SKIPPED:
-         if (parent) elm_interface_atspi_accessible_children_changed_del_signal_emit(parent, obj);
-         elm_interface_atspi_accessible_removed(obj);
-         break;
-      case ELM_ATSPI_TYPE_REGULAR:
-         if (parent) elm_interface_atspi_accessible_children_changed_added_signal_emit(parent, obj);
-         elm_interface_atspi_accessible_added(obj);
-     }
-   pd->type = val;
-}
-
 EOLIAN void
 _elm_interface_atspi_accessible_efl_object_destructor(Eo *obj, Elm_Interface_Atspi_Accessible_Data *pd)
 {
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo
index 7b2330d78f..564208eaf4 100644
--- a/src/lib/elementary/elm_interface_atspi_accessible.eo
+++ b/src/lib/elementary/elm_interface_atspi_accessible.eo
@@ -1,14 +1,6 @@
 /* FIXME: This definitely shouldn't be here. */
 type Efl_Event_Cb: __undefined_type; [[Efl event callback type]]
 
-enum Elm.Atspi.Type
-{
-   [[Type of accessibility object]]
-   regular, [[default accessibile object]]
-   disabled, [[skip object and its children in accessibility hierarchy]]
-   skipped [[skip object in accessibility hierarchy]]
-}
-
 enum Elm.Atspi.Role
 {
    [[Describes the role of an object visible to AT-SPI Clients.]]
@@ -381,16 +373,6 @@ mixin Elm.Interface.Atspi_Accessible (Efl.Interface, Efl.Object)
             domain: string; [[Translation domain]]
          }
       }
-      @property type {
-           [[Type of accessibility object]]
-           get {
-           }
-           set {
-           }
-           values {
-               type: Elm.Atspi.Type; [[Object type]]
-           }
-      }
       relationship_append {
          [[Defines the relationship between two accessible objects.
 
diff --git a/src/lib/elementary/elm_list.c b/src/lib/elementary/elm_list.c
index adc319ff31..ffefa7a433 100644
--- a/src/lib/elementary/elm_list.c
+++ b/src/lib/elementary/elm_list.c
@@ -2331,7 +2331,6 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->icon, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        elm_interface_atspi_accessible_type_set(it->icon, ELM_ATSPI_TYPE_DISABLED);
         elm_widget_tree_unfocusable_set(it->icon, EINA_TRUE);
      }
    if (it->end)
@@ -2340,7 +2339,6 @@ _item_new(Evas_Object *obj,
         evas_object_event_callback_add
           (it->end, EVAS_CALLBACK_CHANGED_SIZE_HINTS, _size_hints_changed_cb,
           obj);
-        elm_interface_atspi_accessible_type_set(it->end, ELM_ATSPI_TYPE_DISABLED);
         elm_widget_tree_unfocusable_set(it->end, EINA_TRUE);
      }
 
@@ -2443,7 +2441,6 @@ _elm_list_efl_canvas_group_group_add(Eo *obj, Elm_List_Data *priv)
    priv->box = elm_box_add(obj);
    evas_object_size_hint_weight_set(priv->box, EVAS_HINT_EXPAND, 0.0);
    evas_object_size_hint_align_set(priv->box, EVAS_HINT_FILL, 0.0);
-   elm_interface_atspi_accessible_type_set(priv->box, ELM_ATSPI_TYPE_DISABLED);
 
    /* FIXME: change this ugly code path later */
    elm_widget_on_show_region_hook_set(priv->box, _show_region_hook, obj);
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 8a79866c1b..9f82e0cac2 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -578,7 +578,6 @@ static void
 _item_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -602,7 +601,6 @@ static void
 _item_separator_obj_create(Elm_Menu_Item_Data *item)
 {
    VIEW(item) = elm_layout_add(WIDGET(item));
-   elm_interface_atspi_accessible_type_set(VIEW(item), ELM_ATSPI_TYPE_SKIPPED);
    evas_object_size_hint_weight_set
      (VIEW(item), EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
    evas_object_size_hint_fill_set(VIEW(item), EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -625,9 +623,7 @@ _item_submenu_obj_create(Elm_Menu_Item_Data *item)
    char style[1024];
 
    item->submenu.location = elm_icon_add(sd->bx);
-   elm_interface_atspi_accessible_type_set(item->submenu.location, ELM_ATSPI_TYPE_DISABLED);
    item->submenu.hv = hv = elm_hover_add(sd->bx);
-   elm_interface_atspi_accessible_type_set(item->submenu.hv, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(hv, EINA_FALSE);
    elm_hover_target_set(hv, item->submenu.location);
    elm_hover_parent_set(hv, sd->parent);
@@ -693,10 +689,8 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
    priv->location = elm_icon_add(obj);
-   elm_interface_atspi_accessible_type_set(priv->location, ELM_ATSPI_TYPE_DISABLED);
 
    priv->hv = elm_hover_add(obj);
-   elm_interface_atspi_accessible_type_set(priv->hv, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(priv->hv, EINA_FALSE);
 
    elm_object_style_set(priv->hv, "menu/default");
@@ -704,7 +698,6 @@ _elm_menu_efl_canvas_group_group_add(Eo *obj, Elm_Menu_Data *priv)
      (priv->hv, ELM_HOVER_EVENT_DISMISSED, _hover_dismissed_cb, obj);
 
    priv->bx = elm_box_add(obj);
-   elm_interface_atspi_accessible_type_set(priv->bx, ELM_ATSPI_TYPE_SKIPPED);
    elm_widget_mirrored_set(priv->bx, EINA_FALSE);
    evas_object_size_hint_weight_set
      (priv->bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -1101,7 +1094,6 @@ _elm_menu_item_add(Eo *obj, Elm_Menu_Data *sd, Elm_Object_Item *parent, const ch
    Evas_Object *icon_obj;
 
    icon_obj = elm_icon_add(obj);
-   elm_interface_atspi_accessible_type_set(icon_obj, ELM_ATSPI_TYPE_DISABLED);
    if (!icon_obj) return NULL;
 
    eo_item = efl_add(ELM_MENU_ITEM_CLASS, obj);
diff --git a/src/lib/elementary/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c
index 95b57e0c9c..0962fe0948 100644
--- a/src/lib/elementary/elm_toolbar.c
+++ b/src/lib/elementary/elm_toolbar.c
@@ -2471,7 +2471,6 @@ _item_new(Evas_Object *obj,
    VIEW(it) = elm_layout_add(obj);
    elm_widget_tree_unfocusable_set(VIEW(it), EINA_TRUE);
    evas_object_data_set(VIEW(it), "item", it);
-   elm_interface_atspi_accessible_type_set(VIEW(it), ELM_ATSPI_TYPE_DISABLED);
 
    icon_obj = elm_icon_add(VIEW(it));
 
@@ -2859,7 +2858,6 @@ _elm_toolbar_efl_canvas_group_group_add(Eo *obj, Elm_Toolbar_Data *priv)
    else
      elm_object_signal_emit(priv->more, "elm,orient,horizontal", "elm");
 
-   elm_interface_atspi_accessible_type_set(priv->more, ELM_ATSPI_TYPE_DISABLED);
    elm_widget_sub_object_add(obj, priv->more);
    evas_object_show(priv->more);
 
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index 69fa61a961..ef82e1efc7 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -6318,22 +6318,12 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm
 {
    Eina_List *l, *accs = NULL;
    Evas_Object *widget;
-   Elm_Atspi_Type type;
 
    EINA_LIST_FOREACH(pd->subobjs, l, widget)
      {
         if (!elm_object_widget_check(widget)) continue;
         if (!efl_isa(widget, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)) continue;
-        type = elm_interface_atspi_accessible_type_get(widget);
-        if (type == ELM_ATSPI_TYPE_DISABLED) continue;
-        if (type == ELM_ATSPI_TYPE_SKIPPED)
-          {
-             Eina_List *children;
-             children = elm_interface_atspi_accessible_children_get(widget);
-             accs = eina_list_merge(accs, children);
-             continue;
-          }
-        accs = eina_list_append(accs, widget);
+          accs = eina_list_append(accs, widget);
      }
    return accs;
 }
@@ -6341,15 +6331,7 @@ _elm_widget_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm
 EOLIAN static Eo*
 _elm_widget_elm_interface_atspi_accessible_parent_get(Eo *obj, Elm_Widget_Smart_Data *pd EINA_UNUSED)
 {
-   Elm_Atspi_Type type;
    Elm_Interface_Atspi_Accessible *parent = obj;
-
-   do {
-        ELM_WIDGET_DATA_GET_OR_RETURN(parent, wd, NULL);
-        parent = wd->parent_obj;
-        type = elm_interface_atspi_accessible_type_get(parent);
-   } while (parent && (type == ELM_ATSPI_TYPE_SKIPPED));
-
    return efl_isa(parent, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN) ? parent : NULL;
 }