elm: access: In access_name_get function call _elm_widget_item_accessible_plain_name_...

to store the name text as well to convert the text.

Change-Id: I0b8ee228efad334725fe909015f19ebcb9fa9727

diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 815f2e9..12770f3 100644 (file)
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -7526,7 +7526,7 @@ _efl_ui_win_efl_access_name_get(Eo *obj, Efl_Ui_Win_Data *sd EINA_UNUSED)
    ret = efl_access_name_get(efl_super(obj, EFL_UI_WIN_CLASS));
    if (ret) return ret;
    const char *name = elm_win_title_get(obj);
-   return name;
+   return _elm_widget_accessible_plain_name_get(obj, name);
 }
 
 EOLIAN static Eina_Rect

diff --git a/src/lib/elementary/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c
index 7eb2547..833555e 100644 (file)
--- a/src/lib/elementary/elc_ctxpopup.c
+++ b/src/lib/elementary/elc_ctxpopup.c
@@ -1685,7 +1685,10 @@ _elm_ctxpopup_efl_access_component_highlight_clear(Eo *obj EINA_UNUSED, Elm_Ctxp
 EOLIAN static const char*
 _elm_ctxpopup_item_efl_access_name_get(Eo *eo_it EINA_UNUSED, Elm_Ctxpopup_Item_Data *item)
 {
-   return strdup(elm_object_item_text_get(item->list_item));
+   const char *ret;
+   ret = efl_access_name_get(efl_super(eo_it, ELM_CTXPOPUP_ITEM_CLASS));
+   if (ret) return ret;
+   return _elm_widget_item_accessible_plain_name_get(eo_it, elm_object_item_text_get(item->list_item));
 }
 //
 

diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index 1faaa5f..9aa1a53 100644 (file)
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -411,9 +411,9 @@ _atspi_expose_title(Eo *obj, Eina_Bool is_atspi)
 static char *
 _access_name_set_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
-   char *text = data;
-   if (text)
-      return strdup(text);
+   char *text = NULL;
+   if (data) text = _elm_util_mkup_to_text((char*)data);
+   if (text) return strdup(text);
    return NULL;
 }
 

diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 2e3e1e7..029efa0 100644 (file)
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -1708,7 +1708,7 @@ _elm_spinner_efl_access_name_get(Eo *obj, Elm_Spinner_Data *sd)
      }
    else
      ret = elm_layout_text_get(obj, "elm.text");
-   return ret;
+   return _elm_widget_accessible_plain_name_get(obj, ret);
 }
 
 // A11Y Accessibility - END