change markup text to utf8 when called accessible_name_get function

Change-Id: I3a13146ed11287c35d007bfb0d5f712ff40a7fb3

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index b004a81bf0600fda468ed9ab172a6efa2ccb39be..d093859cd1f2ae81b4e899dccda5dadc185bd472 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1758,11 +1758,12 @@ _elm_ctxpopup_elm_interface_atspi_component_highlight_clear(Eo *obj EINA_UNUSED,
 EOLIAN const char *
 _elm_ctxpopup_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Ctxpopup_Item_Data *item)
 {
-   char *accessible_name = NULL;
+   const char *accessible_name = NULL;
+   char *utf8_text = NULL;
    eo_do_super(eo_it, ELM_CTXPOPUP_ITEM_CLASS, accessible_name = (char *)elm_interface_atspi_accessible_name_get());
    if (accessible_name) return accessible_name;
 
-   return elm_object_item_text_get(item->list_item);
+   return _elm_util_mkup_to_text(elm_object_item_text_get(item->list_item));
 }
 //
 

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index b945fd2ca5243a01066b2bdf80a8869c6565015b..50f0f9641f52f6e1180c7984dd3cad618319c06d 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -2281,7 +2281,7 @@ _elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, El
    eo_do_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
    ret = elm_object_part_text_get(VIEW(it), "elm.btn.text");
-   return ret;
+   return _elm_util_mkup_to_text(ret);
 }
 
 EOLIAN static Elm_Atspi_State_Set

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index 2ace342616bf54d4e9010b8371e97f0ae3bac4a6..ecb653ce9dcd9b984ff5b3833922f0136dbca6a4 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -611,7 +611,7 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it EINA_UNUSED,
         if (nit->title_label) strncat(buf, " ", 1);
         strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
      }
-   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(buf));
+   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(_elm_util_mkup_to_text(buf)));
 
    elm_layout_sizing_eval(WIDGET(nit));
 }
@@ -1383,7 +1383,7 @@ _item_new(Evas_Object *obj,
    //item base layout
    VIEW(it) = elm_layout_add(obj);
    eo_do(VIEW(it), elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB));
-   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set((char*)title_label));
+   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(_elm_util_mkup_to_text((char*)title_label)));
    evas_object_smart_member_add(VIEW(it), obj);
 
    if (!elm_widget_sub_object_add(obj, VIEW(it)))

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index 990cf1a14416f7f7a0d456e15a6eaffa63b314cb..c39b0defc82771c1212274112dbe770aab07d05c 100644 (file)
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -451,9 +451,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;
 }
 
@@ -2523,6 +2523,7 @@ _elm_popup_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Popup_Data *sd)
    Eina_Strbuf *buf;
    char *accessible_name = NULL;
    const char *_parent_name = NULL;
+   char *utf8_text = NULL;
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
 
    buf = eina_strbuf_new();
@@ -2537,11 +2538,13 @@ _elm_popup_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Popup_Data *sd)
      {
         eina_strbuf_append_printf(buf, "%s", N_("Alert"));
         if (sd->title_text)
-          eina_strbuf_append_printf(buf, ", %s", sd->title_text);
+             utf8_text = _elm_util_mkup_to_text(sd->title_text);
         else if (sd->text_content_obj)
-          eina_strbuf_append_printf(buf, ", %s", elm_object_text_get(sd->text_content_obj));
+             utf8_text = _elm_util_mkup_to_text(elm_object_text_get(sd->text_content_obj));
         else if (elm_object_part_text_get(obj, "elm.text"))
-          eina_strbuf_append_printf(buf, ", %s", elm_object_part_text_get(obj, "elm.text"));
+             utf8_text = _elm_util_mkup_to_text(elm_object_part_text_get(obj, "elm.text"));
+
+        if (utf8_text) eina_strbuf_append_printf(buf, ", %s", utf8_text);
      }
 
    accessible_name = eina_strbuf_string_steal(buf);

diff --git a/src/lib/elm_access.c b/src/lib/elm_access.c
index fbe40648070eb488c83acb37211e1cd182b1b38d..8d0ffcf2fd05638293022fc9e07ef24ce4532cfd 100644 (file)
--- a/src/lib/elm_access.c
+++ b/src/lib/elm_access.c
@@ -1497,7 +1497,6 @@ _elm_access_elm_interface_atspi_accessible_description_get(Eo *obj, void *pd EIN
    eo_do_super(obj, ELM_ACCESS_CLASS, ret = elm_interface_atspi_accessible_description_get());
    if (ret) return ret;
    //
-
    return elm_access_info_get(obj, ELM_ACCESS_CONTEXT_INFO);
 }
 

diff --git a/src/lib/elm_colorselector.c b/src/lib/elm_colorselector.c
index f7a8b2c216f200c82e94a92b21ebe35bced0d8aa..fe1eff6f14a6d3970b52140fc8830768a249035e 100644 (file)
--- a/src/lib/elm_colorselector.c
+++ b/src/lib/elm_colorselector.c
@@ -955,7 +955,7 @@ _create_colorpicker(Evas_Object *obj)
 
         sd->spinners[i] = spinner;
      }
-     
+
    elm_layout_content_set(sd->picker, "elm.swallow.red", sd->spinners[0]);
    elm_layout_text_set(sd->picker, "elm.label.red", E_("R:"));
    elm_layout_content_set(sd->picker, "elm.swallow.green", sd->spinners[1]);

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 1e0cb49cb7ed19ee2fc71220c96896ed7e8a977e..442c80035207ea81cddb85e4c80bcb2b1d9ad119 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -7810,7 +7810,7 @@ EOLIAN static const char*
 _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Entry_Data *sd)
 {
    const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
-   return ret;
+   return _elm_util_mkup_to_text(ret);
 }
 
 //TIZEN ONLY (20160609): Added atspi action interface in entry

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 59a5b7e6a1a3da270b6982806449774d1db0c32f..2d891ad9addbb96b5fbb16cf914ef141cbc208d0 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -824,7 +824,7 @@ _sel_eval(Evas_Object *obj,
                        _elm_access_say(ret);
                     }
 
-                  if (om_closest) 
+                  if (om_closest)
                     eo_do(obj, eo_event_callback_call
                       (ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest)));
                   else
@@ -1809,7 +1809,7 @@ _elm_index_elm_interface_atspi_accessible_children_get(Eo *eo_it EINA_UNUSED, El
 EOLIAN static const char*
 _elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data)
 {
-   return data->letter;
+   return _elm_util_mkup_to_text(data->letter);
 }
 
 EOLIAN static const Elm_Atspi_Action*

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 6449aef0b92837bb44cd90845ebe7d2fd7b019a4..95562776cc7a36ff96b7f896bc54e098a866c695 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2196,7 +2196,7 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
 EOLIAN static const char*
 _elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *data)
 {
-   return data->label;
+   return _elm_util_mkup_to_text(data->label);
 }
 
 EOLIAN static Eina_List*

diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index d060dfbc3c7bce3d4deb8be4e6fb21bd020c9ede..7c6e7ec8f68695132fe0073be2d6f8a2d2d4119e 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1917,7 +1917,7 @@ _elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *
         ret = elm_layout_text_get(obj, "elm.text");
      }
    //
-   return ret;
+   return _elm_util_mkup_to_text(ret);
 }
 
 // A11Y Accessibility - END

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index fb943586237971c30a2d2e3402d45ca7f2906b7b..a34ac9451f822fe41f8e7ea5bac9fdafdbcc551c 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -4128,7 +4128,7 @@ _elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolb
    const char *ret;
    eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
-   return item->label;
+   return _elm_util_mkup_to_text(item->label);
 }
 
 EOLIAN static Elm_Atspi_State_Set

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index aa223bca284181e575ec449d98f8ee02e679ca74..c72f1391e5161577feb8501946a2bd0530b5f9b7 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -7014,10 +7014,11 @@ EOLIAN static const char*
 _elm_win_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Win_Data *sd EINA_UNUSED)
 {
    const char *ret = NULL;
+   char *utf8_text = NULL;
    eo_do_super(obj, ELM_WIN_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
 
-   return elm_win_title_get(obj);
+   return _elm_util_mkup_to_text(elm_win_title_get(obj));
 }
 
 #include "elm_win.eo.c"

diff --git a/src/mobile_lib/elc_ctxpopup.c b/src/mobile_lib/elc_ctxpopup.c
index 296fe950e66a36104b324ed01b562cbc09f56368..3bb6295c3784a4d2715713b603991b720c303721 100644 (file)
--- a/src/mobile_lib/elc_ctxpopup.c
+++ b/src/mobile_lib/elc_ctxpopup.c
@@ -2456,7 +2456,7 @@ _elm_ctxpopup_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Ctxpopup_Data
    eina_strbuf_free(buf);
 
    eina_stringshare_del(wd->accessible_name);
-   wd->accessible_name =  eina_stringshare_add(accessible_name);
+   wd->accessible_name = eina_stringshare_add(accessible_name);
    free(accessible_name);
    return wd->accessible_name;
 }
@@ -2576,7 +2576,7 @@ _elm_ctxpopup_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Ctxpop
         return icon_name;
      }
    else
-     return item->label;
+     return _elm_util_mkup_to_text(item->label);
 }
 //