summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorShinwoo Kim <cinoo.kim@samsung.com>2013-07-31 12:53:04 +0900
committerShinwoo Kim <cinoo.kim@samsung.com>2013-07-31 12:57:49 +0900
commitc47ef1b7fee19363834c93f13f6cf05d3ba6b021 (patch)
treefa42b7688a832391a20337ab8a709b86845d05c3 /legacy
parentcd9f1a22bc7cc2f0df3d989d206efe37b70b69f3 (diff)
[access] use proper name _elm_access_info_get(); not _elm_access_object_get(); to get access information
Diffstat (limited to 'legacy')
-rw-r--r--legacy/elementary/ChangeLog4
-rw-r--r--legacy/elementary/NEWS1
-rw-r--r--legacy/elementary/src/lib/elc_multibuttonentry.c8
-rw-r--r--legacy/elementary/src/lib/elc_naviframe.c8
-rw-r--r--legacy/elementary/src/lib/elc_popup.c16
-rw-r--r--legacy/elementary/src/lib/elm_access.c28
-rw-r--r--legacy/elementary/src/lib/elm_bubble.c4
-rw-r--r--legacy/elementary/src/lib/elm_button.c6
-rw-r--r--legacy/elementary/src/lib/elm_calendar.c16
-rw-r--r--legacy/elementary/src/lib/elm_check.c6
-rw-r--r--legacy/elementary/src/lib/elm_clock.c22
-rw-r--r--legacy/elementary/src/lib/elm_colorselector.c4
-rw-r--r--legacy/elementary/src/lib/elm_datetime.c2
-rw-r--r--legacy/elementary/src/lib/elm_dayselector.c2
-rw-r--r--legacy/elementary/src/lib/elm_diskselector.c6
-rw-r--r--legacy/elementary/src/lib/elm_entry.c6
-rw-r--r--legacy/elementary/src/lib/elm_gengrid.c2
-rw-r--r--legacy/elementary/src/lib/elm_genlist.c2
-rw-r--r--legacy/elementary/src/lib/elm_index.c4
-rw-r--r--legacy/elementary/src/lib/elm_label.c4
-rw-r--r--legacy/elementary/src/lib/elm_list.c2
-rw-r--r--legacy/elementary/src/lib/elm_panel.c4
-rw-r--r--legacy/elementary/src/lib/elm_progressbar.c6
-rw-r--r--legacy/elementary/src/lib/elm_radio.c6
-rw-r--r--legacy/elementary/src/lib/elm_segment_control.c2
-rw-r--r--legacy/elementary/src/lib/elm_slider.c6
-rw-r--r--legacy/elementary/src/lib/elm_spinner.c6
-rw-r--r--legacy/elementary/src/lib/elm_toolbar.c2
-rw-r--r--legacy/elementary/src/lib/elm_widget.c2
-rw-r--r--legacy/elementary/src/lib/elm_widget.h4
-rw-r--r--legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c4
31 files changed, 104 insertions, 91 deletions
diff --git a/legacy/elementary/ChangeLog b/legacy/elementary/ChangeLog
index 954dd502ab..37b5535a8b 100644
--- a/legacy/elementary/ChangeLog
+++ b/legacy/elementary/ChangeLog
@@ -1520,3 +1520,7 @@
1520 1520
1521 * Flip : Fix the flip page to not flip on a direction if the direction 1521 * Flip : Fix the flip page to not flip on a direction if the direction
1522 is disabled. 1522 is disabled.
1523
15242013-07-31 Shinwoo Kim
1525
1526 * Add _elm_access_object_get, deprecate _elm_access_info_get.
diff --git a/legacy/elementary/NEWS b/legacy/elementary/NEWS
index 54354b9ea5..ab0d98276f 100644
--- a/legacy/elementary/NEWS
+++ b/legacy/elementary/NEWS
@@ -81,6 +81,7 @@ Additions:
81 * Add the configuration thumbscroll_flick_distance_tolerance. 81 * Add the configuration thumbscroll_flick_distance_tolerance.
82 * Add elm_access_highlight_next_set, export elm_widget_focus_region_show 82 * Add elm_access_highlight_next_set, export elm_widget_focus_region_show
83 * File Selector : Support elm_object_part_text_set() for the ok, cancel part to change the OK, Cancel button label. 83 * File Selector : Support elm_object_part_text_set() for the ok, cancel part to change the OK, Cancel button label.
84 * Add _elm_access_object_get, deprecate _elm_access_info_get
84 85
85Improvements: 86Improvements:
86 87
diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/legacy/elementary/src/lib/elc_multibuttonentry.c
index eda426db42..7531b07b4f 100644
--- a/legacy/elementary/src/lib/elc_multibuttonentry.c
+++ b/legacy/elementary/src/lib/elc_multibuttonentry.c
@@ -625,7 +625,7 @@ _access_multibuttonentry_label_register(Evas_Object *obj, Eina_Bool is_access)
625 Evas_Object *ao; 625 Evas_Object *ao;
626 ao = _elm_access_edje_object_part_object_register 626 ao = _elm_access_edje_object_part_object_register
627 (obj, sd->label, "mbe.label"); 627 (obj, sd->label, "mbe.label");
628 _elm_access_text_set(_elm_access_object_get(ao), 628 _elm_access_text_set(_elm_access_info_get(ao),
629 ELM_ACCESS_TYPE, E_("multi button entry label")); 629 ELM_ACCESS_TYPE, E_("multi button entry label"));
630 } 630 }
631 else 631 else
@@ -647,7 +647,7 @@ _access_multibuttonentry_item_register(Evas_Object *obj,
647 Evas_Object *ao; 647 Evas_Object *ao;
648 ao = _elm_access_edje_object_part_object_register 648 ao = _elm_access_edje_object_part_object_register
649 (obj, item->button, "elm.btn.text"); 649 (obj, item->button, "elm.btn.text");
650 _elm_access_text_set(_elm_access_object_get(ao), 650 _elm_access_text_set(_elm_access_info_get(ao),
651 ELM_ACCESS_TYPE, E_("multi button entry item")); 651 ELM_ACCESS_TYPE, E_("multi button entry item"));
652 } 652 }
653 else 653 else
@@ -1552,9 +1552,9 @@ _elm_multibuttonentry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
1552 // ACCESS 1552 // ACCESS
1553 _elm_access_object_register(obj, wd->resize_obj); 1553 _elm_access_object_register(obj, wd->resize_obj);
1554 _elm_access_text_set 1554 _elm_access_text_set
1555 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("multi button entry")); 1555 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("multi button entry"));
1556 _elm_access_callback_set 1556 _elm_access_callback_set
1557 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 1557 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
1558} 1558}
1559 1559
1560static void 1560static void
diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/legacy/elementary/src/lib/elc_naviframe.c
index 21acdc4b5c..f8b99ff6f2 100644
--- a/legacy/elementary/src/lib/elc_naviframe.c
+++ b/legacy/elementary/src/lib/elc_naviframe.c
@@ -380,9 +380,9 @@ _access_obj_process(Elm_Naviframe_Item *it, Eina_Bool is_access)
380 eo = elm_layout_edje_get(VIEW(it)); 380 eo = elm_layout_edje_get(VIEW(it));
381 ao =_elm_access_edje_object_part_object_register(WIDGET(it), eo, 381 ao =_elm_access_edje_object_part_object_register(WIDGET(it), eo,
382 TITLE_ACCESS_PART); 382 TITLE_ACCESS_PART);
383 _elm_access_text_set(_elm_access_object_get(ao), 383 _elm_access_text_set(_elm_access_info_get(ao),
384 ELM_ACCESS_TYPE, E_("Title")); 384 ELM_ACCESS_TYPE, E_("Title"));
385 _elm_access_callback_set(_elm_access_object_get(ao), 385 _elm_access_callback_set(_elm_access_info_get(ao),
386 ELM_ACCESS_INFO, _access_info_cb, it); 386 ELM_ACCESS_INFO, _access_info_cb, it);
387 /* to access title access object, any idea? */ 387 /* to access title access object, any idea? */
388 ((Elm_Widget_Item *)it)->access_obj = ao; 388 ((Elm_Widget_Item *)it)->access_obj = ao;
@@ -1197,7 +1197,7 @@ _item_new(Evas_Object *obj,
1197 1197
1198 if (!elm_layout_text_get(prev_btn, NULL)) 1198 if (!elm_layout_text_get(prev_btn, NULL))
1199 _elm_access_callback_set 1199 _elm_access_callback_set
1200 (_elm_access_object_get(prev_btn), ELM_ACCESS_INFO, 1200 (_elm_access_info_get(prev_btn), ELM_ACCESS_INFO,
1201 _access_prev_btn_info_cb, it); 1201 _access_prev_btn_info_cb, it);
1202 } 1202 }
1203 1203
@@ -1207,7 +1207,7 @@ _item_new(Evas_Object *obj,
1207 1207
1208 if (!elm_layout_text_get(next_btn, NULL)) 1208 if (!elm_layout_text_get(next_btn, NULL))
1209 _elm_access_text_set 1209 _elm_access_text_set
1210 (_elm_access_object_get(next_btn), ELM_ACCESS_INFO, E_("Next")); 1210 (_elm_access_info_get(next_btn), ELM_ACCESS_INFO, E_("Next"));
1211 } 1211 }
1212 1212
1213 _item_content_set(it, content); 1213 _item_content_set(it, content);
diff --git a/legacy/elementary/src/lib/elc_popup.c b/legacy/elementary/src/lib/elc_popup.c
index 74b2e32466..84c1d28c54 100644
--- a/legacy/elementary/src/lib/elc_popup.c
+++ b/legacy/elementary/src/lib/elc_popup.c
@@ -260,9 +260,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
260 { 260 {
261 ao = _elm_access_edje_object_part_object_register 261 ao = _elm_access_edje_object_part_object_register
262 (obj, wd->resize_obj, ACCESS_TITLE_PART); 262 (obj, wd->resize_obj, ACCESS_TITLE_PART);
263 _elm_access_text_set(_elm_access_object_get(ao), 263 _elm_access_text_set(_elm_access_info_get(ao),
264 ELM_ACCESS_TYPE, E_("Popup Title")); 264 ELM_ACCESS_TYPE, E_("Popup Title"));
265 _elm_access_text_set(_elm_access_object_get(ao), 265 _elm_access_text_set(_elm_access_info_get(ao),
266 ELM_ACCESS_INFO, sd->title_text); 266 ELM_ACCESS_INFO, sd->title_text);
267 } 267 }
268 268
@@ -270,9 +270,9 @@ _access_obj_process(Eo *obj, Eina_Bool is_access)
270 { 270 {
271 ao = _elm_access_edje_object_part_object_register 271 ao = _elm_access_edje_object_part_object_register
272 (obj, wd->resize_obj, ACCESS_BODY_PART); 272 (obj, wd->resize_obj, ACCESS_BODY_PART);
273 _elm_access_text_set(_elm_access_object_get(ao), 273 _elm_access_text_set(_elm_access_info_get(ao),
274 ELM_ACCESS_TYPE, E_("Popup Body Text")); 274 ELM_ACCESS_TYPE, E_("Popup Body Text"));
275 _elm_access_text_set(_elm_access_object_get(ao), 275 _elm_access_text_set(_elm_access_info_get(ao),
276 ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj)); 276 ELM_ACCESS_INFO, elm_object_text_get(sd->text_content_obj));
277 } 277 }
278 } 278 }
@@ -878,10 +878,10 @@ _title_text_set(Evas_Object *obj,
878 { 878 {
879 ao = _elm_access_edje_object_part_object_register 879 ao = _elm_access_edje_object_part_object_register
880 (obj, wd->resize_obj, ACCESS_TITLE_PART); 880 (obj, wd->resize_obj, ACCESS_TITLE_PART);
881 _elm_access_text_set(_elm_access_object_get(ao), 881 _elm_access_text_set(_elm_access_info_get(ao),
882 ELM_ACCESS_TYPE, E_("Popup Title")); 882 ELM_ACCESS_TYPE, E_("Popup Title"));
883 } 883 }
884 _elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO, text); 884 _elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
885 } 885 }
886 886
887 if (sd->title_text) 887 if (sd->title_text)
@@ -946,10 +946,10 @@ _content_text_set(Evas_Object *obj,
946 { 946 {
947 ao = _elm_access_edje_object_part_object_register 947 ao = _elm_access_edje_object_part_object_register
948 (obj, wd->resize_obj, ACCESS_BODY_PART); 948 (obj, wd->resize_obj, ACCESS_BODY_PART);
949 _elm_access_text_set(_elm_access_object_get(ao), 949 _elm_access_text_set(_elm_access_info_get(ao),
950 ELM_ACCESS_TYPE, E_("Popup Body Text")); 950 ELM_ACCESS_TYPE, E_("Popup Body Text"));
951 } 951 }
952 _elm_access_text_set(_elm_access_object_get(ao), ELM_ACCESS_INFO, text); 952 _elm_access_text_set(_elm_access_info_get(ao), ELM_ACCESS_INFO, text);
953 } 953 }
954 954
955end: 955end:
diff --git a/legacy/elementary/src/lib/elm_access.c b/legacy/elementary/src/lib/elm_access.c
index b7d84fa8a0..6115b391a8 100644
--- a/legacy/elementary/src/lib/elm_access.c
+++ b/legacy/elementary/src/lib/elm_access.c
@@ -522,7 +522,7 @@ _access_highlight_next_get(Evas_Object *obj, Elm_Focus_Direction dir)
522 { 522 {
523 if (ho) 523 if (ho)
524 { 524 {
525 Elm_Access_Info *info = _elm_access_object_get(ho); 525 Elm_Access_Info *info = _elm_access_info_get(ho);
526 if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT && info->next) 526 if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT && info->next)
527 target = info->next; 527 target = info->next;
528 else if (type == ELM_ACCESS_ACTION_HIGHLIGHT_PREV && info->prev) 528 else if (type == ELM_ACCESS_ACTION_HIGHLIGHT_PREV && info->prev)
@@ -678,7 +678,7 @@ _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir)
678 if (!ho) elm_widget_focus_cycle(obj, dir); 678 if (!ho) elm_widget_focus_cycle(obj, dir);
679 else if (!_access_action_callback_call(ho, type, NULL)) 679 else if (!_access_action_callback_call(ho, type, NULL))
680 { 680 {
681 Elm_Access_Info *info = _elm_access_object_get(ho); 681 Elm_Access_Info *info = _elm_access_info_get(ho);
682 Evas_Object *comming = NULL; 682 Evas_Object *comming = NULL;
683 if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT) 683 if (type == ELM_ACCESS_ACTION_HIGHLIGHT_NEXT)
684 { 684 {
@@ -772,11 +772,17 @@ _elm_access_say(const char *txt)
772} 772}
773 773
774EAPI Elm_Access_Info * 774EAPI Elm_Access_Info *
775_elm_access_object_get(const Evas_Object *obj) 775_elm_access_info_get(const Evas_Object *obj)
776{ 776{
777 return evas_object_data_get(obj, "_elm_access"); 777 return evas_object_data_get(obj, "_elm_access");
778} 778}
779 779
780EAPI Elm_Access_Info *
781_elm_access_object_get(const Evas_Object *obj)
782{
783 return _elm_access_info_get(obj);
784}
785
780EAPI void 786EAPI void
781_elm_access_object_hilight(Evas_Object *obj) 787_elm_access_object_hilight(Evas_Object *obj)
782{ 788{
@@ -1174,20 +1180,20 @@ elm_access_object_get(const Evas_Object *obj)
1174EAPI void 1180EAPI void
1175elm_access_info_set(Evas_Object *obj, int type, const char *text) 1181elm_access_info_set(Evas_Object *obj, int type, const char *text)
1176{ 1182{
1177 _elm_access_text_set(_elm_access_object_get(obj), type, text); 1183 _elm_access_text_set(_elm_access_info_get(obj), type, text);
1178} 1184}
1179 1185
1180EAPI char * 1186EAPI char *
1181elm_access_info_get(const Evas_Object *obj, int type) 1187elm_access_info_get(const Evas_Object *obj, int type)
1182{ 1188{
1183 return _elm_access_text_get(_elm_access_object_get(obj), type, obj); 1189 return _elm_access_text_get(_elm_access_info_get(obj), type, obj);
1184} 1190}
1185 1191
1186EAPI void 1192EAPI void
1187elm_access_info_cb_set(Evas_Object *obj, int type, 1193elm_access_info_cb_set(Evas_Object *obj, int type,
1188 Elm_Access_Info_Cb func, const void *data) 1194 Elm_Access_Info_Cb func, const void *data)
1189{ 1195{
1190 _elm_access_callback_set(_elm_access_object_get(obj), type, func, data); 1196 _elm_access_callback_set(_elm_access_info_get(obj), type, func, data);
1191} 1197}
1192 1198
1193EAPI void 1199EAPI void
@@ -1196,7 +1202,7 @@ elm_access_activate_cb_set(Evas_Object *obj,
1196{ 1202{
1197 Elm_Access_Info *ac; 1203 Elm_Access_Info *ac;
1198 1204
1199 ac = _elm_access_object_get(obj); 1205 ac = _elm_access_info_get(obj);
1200 if (!ac) return; 1206 if (!ac) return;
1201 1207
1202 ac->activate = func; 1208 ac->activate = func;
@@ -1310,7 +1316,7 @@ EAPI void
1310elm_access_external_info_set(Evas_Object *obj, const char *text) 1316elm_access_external_info_set(Evas_Object *obj, const char *text)
1311{ 1317{
1312 _elm_access_text_set 1318 _elm_access_text_set
1313 (_elm_access_object_get(obj), ELM_ACCESS_CONTEXT_INFO, text); 1319 (_elm_access_info_get(obj), ELM_ACCESS_CONTEXT_INFO, text);
1314} 1320}
1315 1321
1316EAPI char * 1322EAPI char *
@@ -1318,7 +1324,7 @@ elm_access_external_info_get(const Evas_Object *obj)
1318{ 1324{
1319 Elm_Access_Info *ac; 1325 Elm_Access_Info *ac;
1320 1326
1321 ac = _elm_access_object_get(obj); 1327 ac = _elm_access_info_get(obj);
1322 return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj); 1328 return _elm_access_text_get(ac, ELM_ACCESS_CONTEXT_INFO, obj);
1323} 1329}
1324 1330
@@ -1328,8 +1334,8 @@ elm_access_highlight_next_set(Evas_Object *obj, Elm_Highlight_Direction dir, Eva
1328 EINA_SAFETY_ON_FALSE_RETURN(obj); 1334 EINA_SAFETY_ON_FALSE_RETURN(obj);
1329 EINA_SAFETY_ON_FALSE_RETURN(next); 1335 EINA_SAFETY_ON_FALSE_RETURN(next);
1330 1336
1331 Elm_Access_Info *info = _elm_access_object_get(obj); 1337 Elm_Access_Info *info = _elm_access_info_get(obj);
1332 Elm_Access_Info *info_next = _elm_access_object_get(next); 1338 Elm_Access_Info *info_next = _elm_access_info_get(next);
1333 1339
1334 if (!info || !info_next) 1340 if (!info || !info_next)
1335 { 1341 {
diff --git a/legacy/elementary/src/lib/elm_bubble.c b/legacy/elementary/src/lib/elm_bubble.c
index de6d0443d5..c200037527 100644
--- a/legacy/elementary/src/lib/elm_bubble.c
+++ b/legacy/elementary/src/lib/elm_bubble.c
@@ -214,9 +214,9 @@ _elm_bubble_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
214 // ACCESS 214 // ACCESS
215 _elm_access_object_register(obj, wd->resize_obj); 215 _elm_access_object_register(obj, wd->resize_obj);
216 _elm_access_text_set 216 _elm_access_text_set
217 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Bubble")); 217 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Bubble"));
218 _elm_access_callback_set 218 _elm_access_callback_set
219 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 219 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
220 220
221 if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj))) 221 if (!elm_layout_theme_set(obj, "bubble", "base", elm_widget_style_get(obj)))
222 CRITICAL("Failed to set layout!"); 222 CRITICAL("Failed to set layout!");
diff --git a/legacy/elementary/src/lib/elm_button.c b/legacy/elementary/src/lib/elm_button.c
index 6522cf1196..9dada591de 100644
--- a/legacy/elementary/src/lib/elm_button.c
+++ b/legacy/elementary/src/lib/elm_button.c
@@ -304,11 +304,11 @@ _elm_button_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
304 304
305 _elm_access_object_register(obj, wd->resize_obj); 305 _elm_access_object_register(obj, wd->resize_obj);
306 _elm_access_text_set 306 _elm_access_text_set
307 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Button")); 307 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Button"));
308 _elm_access_callback_set 308 _elm_access_callback_set
309 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 309 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
310 _elm_access_callback_set 310 _elm_access_callback_set
311 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj); 311 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
312 312
313 elm_widget_can_focus_set(obj, EINA_TRUE); 313 elm_widget_can_focus_set(obj, EINA_TRUE);
314 if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj))) 314 if (!elm_layout_theme_set(obj, "button", "base", elm_widget_style_get(obj)))
diff --git a/legacy/elementary/src/lib/elm_calendar.c b/legacy/elementary/src/lib/elm_calendar.c
index ae35f2c5e4..dd9a3a3a8b 100644
--- a/legacy/elementary/src/lib/elm_calendar.c
+++ b/legacy/elementary/src/lib/elm_calendar.c
@@ -269,9 +269,9 @@ _access_calendar_item_register(Evas_Object *obj)
269 269
270 ao = _elm_access_edje_object_part_object_register 270 ao = _elm_access_edje_object_part_object_register
271 (obj, elm_layout_edje_get(obj), pname); 271 (obj, elm_layout_edje_get(obj), pname);
272 _elm_access_text_set(_elm_access_object_get(ao), 272 _elm_access_text_set(_elm_access_info_get(ao),
273 ELM_ACCESS_TYPE, E_("calendar item")); 273 ELM_ACCESS_TYPE, E_("calendar item"));
274 _elm_access_callback_set(_elm_access_object_get(ao), 274 _elm_access_callback_set(_elm_access_info_get(ao),
275 ELM_ACCESS_INFO, _access_info_cb, NULL); 275 ELM_ACCESS_INFO, _access_info_cb, NULL);
276 276
277 snprintf(day_s, sizeof(day_s), "%i", day++); 277 snprintf(day_s, sizeof(day_s), "%i", day++);
@@ -295,32 +295,32 @@ _access_calendar_spinner_register(Evas_Object *obj)
295 295
296 sd->dec_btn_month_access = _elm_access_edje_object_part_object_register 296 sd->dec_btn_month_access = _elm_access_edje_object_part_object_register
297 (obj, elm_layout_edje_get(obj), "left_bt"); 297 (obj, elm_layout_edje_get(obj), "left_bt");
298 ai = _elm_access_object_get(sd->dec_btn_month_access); 298 ai = _elm_access_info_get(sd->dec_btn_month_access);
299 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement month button")); 299 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement month button"));
300 300
301 sd->dec_btn_year_access = _elm_access_edje_object_part_object_register 301 sd->dec_btn_year_access = _elm_access_edje_object_part_object_register
302 (obj, elm_layout_edje_get(obj), "left_bt_year"); 302 (obj, elm_layout_edje_get(obj), "left_bt_year");
303 ai = _elm_access_object_get(sd->dec_btn_year_access); 303 ai = _elm_access_info_get(sd->dec_btn_year_access);
304 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement year button")); 304 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar decrement year button"));
305 305
306 sd->inc_btn_month_access = _elm_access_edje_object_part_object_register 306 sd->inc_btn_month_access = _elm_access_edje_object_part_object_register
307 (obj, elm_layout_edje_get(obj), "right_bt"); 307 (obj, elm_layout_edje_get(obj), "right_bt");
308 ai = _elm_access_object_get(sd->inc_btn_month_access); 308 ai = _elm_access_info_get(sd->inc_btn_month_access);
309 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment month button")); 309 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment month button"));
310 310
311 sd->inc_btn_year_access = _elm_access_edje_object_part_object_register 311 sd->inc_btn_year_access = _elm_access_edje_object_part_object_register
312 (obj, elm_layout_edje_get(obj), "right_bt_year"); 312 (obj, elm_layout_edje_get(obj), "right_bt_year");
313 ai = _elm_access_object_get(sd->inc_btn_year_access); 313 ai = _elm_access_info_get(sd->inc_btn_year_access);
314 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment year button")); 314 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar increment year button"));
315 315
316 sd->month_access = _elm_access_edje_object_part_object_register 316 sd->month_access = _elm_access_edje_object_part_object_register
317 (obj, elm_layout_edje_get(obj), "text_month"); 317 (obj, elm_layout_edje_get(obj), "text_month");
318 ai = _elm_access_object_get(sd->month_access); 318 ai = _elm_access_info_get(sd->month_access);
319 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar month")); 319 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar month"));
320 320
321 sd->year_access = _elm_access_edje_object_part_object_register 321 sd->year_access = _elm_access_edje_object_part_object_register
322 (obj, elm_layout_edje_get(obj), "year_text"); 322 (obj, elm_layout_edje_get(obj), "year_text");
323 ai = _elm_access_object_get(sd->year_access); 323 ai = _elm_access_info_get(sd->year_access);
324 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year")); 324 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("calendar year"));
325 325
326 po = (Evas_Object *)edje_object_part_object_get 326 po = (Evas_Object *)edje_object_part_object_get
diff --git a/legacy/elementary/src/lib/elm_check.c b/legacy/elementary/src/lib/elm_check.c
index c6ef5a3dcc..7fc6af092a 100644
--- a/legacy/elementary/src/lib/elm_check.c
+++ b/legacy/elementary/src/lib/elm_check.c
@@ -305,11 +305,11 @@ _elm_check_smart_add(Eo *obj, void *_pd EINA_UNUSED, va_list *list EINA_UNUSED)
305 305
306 _elm_access_object_register(obj, wd->resize_obj); 306 _elm_access_object_register(obj, wd->resize_obj);
307 _elm_access_text_set 307 _elm_access_text_set
308 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Check")); 308 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Check"));
309 _elm_access_callback_set 309 _elm_access_callback_set
310 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj); 310 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
311 _elm_access_callback_set 311 _elm_access_callback_set
312 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj); 312 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
313 313
314 elm_widget_can_focus_set(obj, EINA_TRUE); 314 elm_widget_can_focus_set(obj, EINA_TRUE);
315 315
diff --git a/legacy/elementary/src/lib/elm_clock.c b/legacy/elementary/src/lib/elm_clock.c
index 3b91263cd7..946e5c2411 100644
--- a/legacy/elementary/src/lib/elm_clock.c
+++ b/legacy/elementary/src/lib/elm_clock.c
@@ -247,20 +247,20 @@ _access_time_register(Evas_Object *obj, Eina_Bool is_access)
247 247
248 eina_strbuf_append_printf(strbuf, 248 eina_strbuf_append_printf(strbuf,
249 "clock increment button for %s", digit); 249 "clock increment button for %s", digit);
250 _elm_access_text_set(_elm_access_object_get(ao), 250 _elm_access_text_set(_elm_access_info_get(ao),
251 ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf)); 251 ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
252 _elm_access_activate_callback_set 252 _elm_access_activate_callback_set
253 (_elm_access_object_get(ao), _access_activate_cb, obj); 253 (_elm_access_info_get(ao), _access_activate_cb, obj);
254 254
255 /* decrement button */ 255 /* decrement button */
256 ao = _elm_access_edje_object_part_object_register 256 ao = _elm_access_edje_object_part_object_register
257 (obj, sd->digit[i], "access.b"); 257 (obj, sd->digit[i], "access.b");
258 258
259 eina_strbuf_replace(strbuf, "increment", "decrement", 1); 259 eina_strbuf_replace(strbuf, "increment", "decrement", 1);
260 _elm_access_text_set(_elm_access_object_get(ao), 260 _elm_access_text_set(_elm_access_info_get(ao),
261 ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf)); 261 ELM_ACCESS_TYPE, eina_strbuf_string_get(strbuf));
262 _elm_access_activate_callback_set 262 _elm_access_activate_callback_set
263 (_elm_access_object_get(ao), _access_activate_cb, obj); 263 (_elm_access_info_get(ao), _access_activate_cb, obj);
264 264
265 eina_strbuf_free(strbuf); 265 eina_strbuf_free(strbuf);
266 266
@@ -296,18 +296,18 @@ _access_time_register(Evas_Object *obj, Eina_Bool is_access)
296 /* increment button */ 296 /* increment button */
297 ao = _elm_access_edje_object_part_object_register 297 ao = _elm_access_edje_object_part_object_register
298 (obj, sd->am_pm_obj, "access.t"); 298 (obj, sd->am_pm_obj, "access.t");
299 _elm_access_text_set(_elm_access_object_get(ao), 299 _elm_access_text_set(_elm_access_info_get(ao),
300 ELM_ACCESS_TYPE, E_("clock increment button for am,pm")); 300 ELM_ACCESS_TYPE, E_("clock increment button for am,pm"));
301 _elm_access_activate_callback_set 301 _elm_access_activate_callback_set
302 (_elm_access_object_get(ao), _access_activate_cb, obj); 302 (_elm_access_info_get(ao), _access_activate_cb, obj);
303 303
304 /* decrement button */ 304 /* decrement button */
305 ao = _elm_access_edje_object_part_object_register 305 ao = _elm_access_edje_object_part_object_register
306 (obj, sd->am_pm_obj, "access.b"); 306 (obj, sd->am_pm_obj, "access.b");
307 _elm_access_text_set(_elm_access_object_get(ao), 307 _elm_access_text_set(_elm_access_info_get(ao),
308 ELM_ACCESS_TYPE, E_("clock decrement button for am,pm")); 308 ELM_ACCESS_TYPE, E_("clock decrement button for am,pm"));
309 _elm_access_activate_callback_set 309 _elm_access_activate_callback_set
310 (_elm_access_object_get(ao), _access_activate_cb, obj); 310 (_elm_access_info_get(ao), _access_activate_cb, obj);
311 311
312 edje_object_signal_emit 312 edje_object_signal_emit
313 (sd->am_pm_obj, "elm,state,access,edit,on", "elm"); 313 (sd->am_pm_obj, "elm,state,access,edit,on", "elm");
@@ -690,12 +690,12 @@ _elm_clock_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
690 690
691 _elm_access_object_register(obj, wd->resize_obj); 691 _elm_access_object_register(obj, wd->resize_obj);
692 _elm_access_text_set 692 _elm_access_text_set
693 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Clock")); 693 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Clock"));
694 _elm_access_callback_set 694 _elm_access_callback_set
695 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 695 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
696 evas_object_propagate_events_set(obj, EINA_FALSE); 696 evas_object_propagate_events_set(obj, EINA_FALSE);
697 _elm_access_callback_set 697 _elm_access_callback_set
698 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL); 698 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
699} 699}
700 700
701static void 701static void
diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/legacy/elementary/src/lib/elm_colorselector.c
index cec99af886..25e272762e 100644
--- a/legacy/elementary/src/lib/elm_colorselector.c
+++ b/legacy/elementary/src/lib/elm_colorselector.c
@@ -878,7 +878,7 @@ _access_colorbar_register(Evas_Object *obj,
878 const char* colorbar_type = NULL; 878 const char* colorbar_type = NULL;
879 879
880 ao = _elm_access_edje_object_part_object_register(obj, cd->colorbar, part); 880 ao = _elm_access_edje_object_part_object_register(obj, cd->colorbar, part);
881 ai = _elm_access_object_get(ao); 881 ai = _elm_access_info_get(ao);
882 882
883 switch (cd->color_type) 883 switch (cd->color_type)
884 { 884 {
@@ -1351,7 +1351,7 @@ _access_widget_item_register(Elm_Color_Item *it)
1351 1351
1352 _elm_access_widget_item_register((Elm_Widget_Item *)it); 1352 _elm_access_widget_item_register((Elm_Widget_Item *)it);
1353 1353
1354 ai = _elm_access_object_get(it->base.access_obj); 1354 ai = _elm_access_info_get(it->base.access_obj);
1355 1355
1356 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("color selector palette item")); 1356 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("color selector palette item"));
1357 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 1357 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/legacy/elementary/src/lib/elm_datetime.c b/legacy/elementary/src/lib/elm_datetime.c
index f5cbd86721..b0d7d6cb09 100644
--- a/legacy/elementary/src/lib/elm_datetime.c
+++ b/legacy/elementary/src/lib/elm_datetime.c
@@ -841,7 +841,7 @@ _elm_datetime_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
841 priv->access_obj = _elm_access_edje_object_part_object_register 841 priv->access_obj = _elm_access_edje_object_part_object_register
842 (obj, elm_layout_edje_get(obj), "access"); 842 (obj, elm_layout_edje_get(obj), "access");
843 843
844 ai = _elm_access_object_get(priv->access_obj); 844 ai = _elm_access_info_get(priv->access_obj);
845 _elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time"); 845 _elm_access_text_set(ai, ELM_ACCESS_TYPE, "date time");
846 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj); 846 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
847 } 847 }
diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/legacy/elementary/src/lib/elm_dayselector.c
index ffede0a64d..066c7a5cd1 100644
--- a/legacy/elementary/src/lib/elm_dayselector.c
+++ b/legacy/elementary/src/lib/elm_dayselector.c
@@ -417,7 +417,7 @@ _items_create(Evas_Object *obj)
417 elm_layout_content_set(obj, buf, chk); 417 elm_layout_content_set(obj, buf, chk);
418 418
419 // XXX: ACCESS 419 // XXX: ACCESS
420 _elm_access_text_set(_elm_access_object_get(chk), 420 _elm_access_text_set(_elm_access_info_get(chk),
421 ELM_ACCESS_TYPE, E_("day selector item")); 421 ELM_ACCESS_TYPE, E_("day selector item"));
422 } 422 }
423 423
diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/legacy/elementary/src/lib/elm_diskselector.c
index 82ba815dbe..4ad0af89d0 100644
--- a/legacy/elementary/src/lib/elm_diskselector.c
+++ b/legacy/elementary/src/lib/elm_diskselector.c
@@ -667,13 +667,13 @@ _item_new(Evas_Object *obj,
667 { 667 {
668 _elm_access_widget_item_register((Elm_Widget_Item *)it); 668 _elm_access_widget_item_register((Elm_Widget_Item *)it);
669 669
670 _elm_access_text_set(_elm_access_object_get(it->base.access_obj), 670 _elm_access_text_set(_elm_access_info_get(it->base.access_obj),
671 ELM_ACCESS_TYPE, E_("diskselector item")); 671 ELM_ACCESS_TYPE, E_("diskselector item"));
672 _elm_access_callback_set(_elm_access_object_get(it->base.access_obj), 672 _elm_access_callback_set(_elm_access_info_get(it->base.access_obj),
673 ELM_ACCESS_INFO, 673 ELM_ACCESS_INFO,
674 _access_info_cb, it); 674 _access_info_cb, it);
675 _elm_access_on_highlight_hook_set( 675 _elm_access_on_highlight_hook_set(
676 _elm_access_object_get(it->base.access_obj), _access_on_highlight_cb, 676 _elm_access_info_get(it->base.access_obj), _access_on_highlight_cb,
677 it); 677 it);
678 } 678 }
679 679
diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index 0385138979..2a663e69d6 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -3118,11 +3118,11 @@ _elm_entry_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
3118 // access 3118 // access
3119 _elm_access_object_register(obj, priv->entry_edje); 3119 _elm_access_object_register(obj, priv->entry_edje);
3120 _elm_access_text_set 3120 _elm_access_text_set
3121 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Entry")); 3121 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Entry"));
3122 _elm_access_callback_set 3122 _elm_access_callback_set
3123 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 3123 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
3124 _elm_access_callback_set 3124 _elm_access_callback_set
3125 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL); 3125 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
3126} 3126}
3127 3127
3128static void 3128static void
diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/legacy/elementary/src/lib/elm_gengrid.c
index 1cd7480ed1..a8dde7e509 100644
--- a/legacy/elementary/src/lib/elm_gengrid.c
+++ b/legacy/elementary/src/lib/elm_gengrid.c
@@ -719,7 +719,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
719 719
720 _elm_access_widget_item_register((Elm_Widget_Item *)it); 720 _elm_access_widget_item_register((Elm_Widget_Item *)it);
721 721
722 ai = _elm_access_object_get(it->base.access_obj); 722 ai = _elm_access_info_get(it->base.access_obj);
723 723
724 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Gengrid Item")); 724 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Gengrid Item"));
725 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 725 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/legacy/elementary/src/lib/elm_genlist.c b/legacy/elementary/src/lib/elm_genlist.c
index 7b0ac6169e..c83a272899 100644
--- a/legacy/elementary/src/lib/elm_genlist.c
+++ b/legacy/elementary/src/lib/elm_genlist.c
@@ -1408,7 +1408,7 @@ _access_widget_item_register(Elm_Gen_Item *it)
1408 1408
1409 _elm_access_widget_item_register((Elm_Widget_Item *)it); 1409 _elm_access_widget_item_register((Elm_Widget_Item *)it);
1410 1410
1411 ai = _elm_access_object_get(it->base.access_obj); 1411 ai = _elm_access_info_get(it->base.access_obj);
1412 1412
1413 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 1413 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
1414 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it); 1414 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);
diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c
index d46d154688..d924b64ac2 100644
--- a/legacy/elementary/src/lib/elm_index.c
+++ b/legacy/elementary/src/lib/elm_index.c
@@ -99,7 +99,7 @@ _access_index_register(Evas_Object *obj)
99 ao = _elm_access_edje_object_part_object_register 99 ao = _elm_access_edje_object_part_object_register
100 (obj, elm_layout_edje_get(obj), "access"); 100 (obj, elm_layout_edje_get(obj), "access");
101 _elm_access_text_set 101 _elm_access_text_set
102 (_elm_access_object_get(ao), ELM_ACCESS_TYPE, E_("Index")); 102 (_elm_access_info_get(ao), ELM_ACCESS_TYPE, E_("Index"));
103} 103}
104 104
105static char * 105static char *
@@ -124,7 +124,7 @@ _access_widget_item_register(Elm_Index_Item *it)
124 124
125 _elm_access_widget_item_register((Elm_Widget_Item *)it); 125 _elm_access_widget_item_register((Elm_Widget_Item *)it);
126 126
127 ai = _elm_access_object_get(it->base.access_obj); 127 ai = _elm_access_info_get(it->base.access_obj);
128 128
129 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Index Item")); 129 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Index Item"));
130 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 130 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/legacy/elementary/src/lib/elm_label.c b/legacy/elementary/src/lib/elm_label.c
index 97b9667e24..b6bf1f7a09 100644
--- a/legacy/elementary/src/lib/elm_label.c
+++ b/legacy/elementary/src/lib/elm_label.c
@@ -404,9 +404,9 @@ _elm_label_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
404 404
405 _elm_access_object_register(obj, wd->resize_obj); 405 _elm_access_object_register(obj, wd->resize_obj);
406 _elm_access_text_set 406 _elm_access_text_set
407 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Label")); 407 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Label"));
408 _elm_access_callback_set 408 _elm_access_callback_set
409 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 409 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
410 410
411 if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj))) 411 if (!elm_layout_theme_set(obj, "label", "base", elm_widget_style_get(obj)))
412 CRITICAL("Failed to set layout!"); 412 CRITICAL("Failed to set layout!");
diff --git a/legacy/elementary/src/lib/elm_list.c b/legacy/elementary/src/lib/elm_list.c
index 5b8610c004..be353ba20f 100644
--- a/legacy/elementary/src/lib/elm_list.c
+++ b/legacy/elementary/src/lib/elm_list.c
@@ -1553,7 +1553,7 @@ _access_widget_item_register(Elm_List_Item *it, Eina_Bool is_access)
1553 { 1553 {
1554 _elm_access_widget_item_register((Elm_Widget_Item *)it); 1554 _elm_access_widget_item_register((Elm_Widget_Item *)it);
1555 1555
1556 ai = _elm_access_object_get(it->base.access_obj); 1556 ai = _elm_access_info_get(it->base.access_obj);
1557 1557
1558 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 1558 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
1559 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it); 1559 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, it);
diff --git a/legacy/elementary/src/lib/elm_panel.c b/legacy/elementary/src/lib/elm_panel.c
index addeb54a6b..848f8d4760 100644
--- a/legacy/elementary/src/lib/elm_panel.c
+++ b/legacy/elementary/src/lib/elm_panel.c
@@ -113,10 +113,10 @@ _orient_set_do(Evas_Object *obj)
113 Evas_Object *ao; 113 Evas_Object *ao;
114 ao = _elm_access_edje_object_part_object_register 114 ao = _elm_access_edje_object_part_object_register
115 (obj, wd->resize_obj, "btn_icon"); 115 (obj, wd->resize_obj, "btn_icon");
116 _elm_access_text_set(_elm_access_object_get(ao), 116 _elm_access_text_set(_elm_access_info_get(ao),
117 ELM_ACCESS_TYPE, E_("panel button")); 117 ELM_ACCESS_TYPE, E_("panel button"));
118 _elm_access_callback_set 118 _elm_access_callback_set
119 (_elm_access_object_get(ao), ELM_ACCESS_STATE, _access_state_cb, obj); 119 (_elm_access_info_get(ao), ELM_ACCESS_STATE, _access_state_cb, obj);
120 } 120 }
121} 121}
122 122
diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/legacy/elementary/src/lib/elm_progressbar.c
index d28fa6802c..4adb438a2a 100644
--- a/legacy/elementary/src/lib/elm_progressbar.c
+++ b/legacy/elementary/src/lib/elm_progressbar.c
@@ -271,11 +271,11 @@ _elm_progressbar_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
271 271
272 _elm_access_object_register(obj, wd->resize_obj); 272 _elm_access_object_register(obj, wd->resize_obj);
273 _elm_access_text_set 273 _elm_access_text_set
274 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("progressbar")); 274 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("progressbar"));
275 _elm_access_callback_set 275 _elm_access_callback_set
276 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 276 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
277 _elm_access_callback_set 277 _elm_access_callback_set
278 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL); 278 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
279} 279}
280 280
281static void 281static void
diff --git a/legacy/elementary/src/lib/elm_radio.c b/legacy/elementary/src/lib/elm_radio.c
index 2beb27ffd0..e606b739ee 100644
--- a/legacy/elementary/src/lib/elm_radio.c
+++ b/legacy/elementary/src/lib/elm_radio.c
@@ -290,11 +290,11 @@ _elm_radio_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
290 290
291 _elm_access_object_register(obj, wd->resize_obj); 291 _elm_access_object_register(obj, wd->resize_obj);
292 _elm_access_text_set 292 _elm_access_text_set
293 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("Radio")); 293 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("Radio"));
294 _elm_access_callback_set 294 _elm_access_callback_set
295 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj); 295 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, obj);
296 _elm_access_callback_set 296 _elm_access_callback_set
297 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj); 297 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, obj);
298} 298}
299 299
300static void 300static void
diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/legacy/elementary/src/lib/elm_segment_control.c
index 81e564a7fa..642ada4856 100644
--- a/legacy/elementary/src/lib/elm_segment_control.c
+++ b/legacy/elementary/src/lib/elm_segment_control.c
@@ -549,7 +549,7 @@ _access_widget_item_register(Elm_Segment_Item *it)
549 549
550 _elm_access_widget_item_register((Elm_Widget_Item *)it); 550 _elm_access_widget_item_register((Elm_Widget_Item *)it);
551 551
552 ai = _elm_access_object_get(it->base.access_obj); 552 ai = _elm_access_info_get(it->base.access_obj);
553 553
554 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Segment Control Item")); 554 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Segment Control Item"));
555 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 555 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/legacy/elementary/src/lib/elm_slider.c b/legacy/elementary/src/lib/elm_slider.c
index 097f0f2549..ddf6412f9d 100644
--- a/legacy/elementary/src/lib/elm_slider.c
+++ b/legacy/elementary/src/lib/elm_slider.c
@@ -859,11 +859,11 @@ _elm_slider_smart_add(Eo *obj, void *_pd, va_list *list EINA_UNUSED)
859 859
860 _elm_access_object_register(obj, wd->resize_obj); 860 _elm_access_object_register(obj, wd->resize_obj);
861 _elm_access_text_set 861 _elm_access_text_set
862 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, E_("slider")); 862 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, E_("slider"));
863 _elm_access_callback_set 863 _elm_access_callback_set
864 (_elm_access_object_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL); 864 (_elm_access_info_get(obj), ELM_ACCESS_INFO, _access_info_cb, NULL);
865 _elm_access_callback_set 865 _elm_access_callback_set
866 (_elm_access_object_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL); 866 (_elm_access_info_get(obj), ELM_ACCESS_STATE, _access_state_cb, NULL);
867 867
868 evas_object_smart_changed(obj); 868 evas_object_smart_changed(obj);
869} 869}
diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c
index 0afd7ac895..060f443fad 100644
--- a/legacy/elementary/src/lib/elm_spinner.c
+++ b/legacy/elementary/src/lib/elm_spinner.c
@@ -610,7 +610,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
610 ao = _elm_access_edje_object_part_object_register 610 ao = _elm_access_edje_object_part_object_register
611 (obj, elm_layout_edje_get(obj), increment_part); 611 (obj, elm_layout_edje_get(obj), increment_part);
612 612
613 ai = _elm_access_object_get(ao); 613 ai = _elm_access_info_get(ao);
614 _elm_access_text_set(ai, ELM_ACCESS_TYPE, 614 _elm_access_text_set(ai, ELM_ACCESS_TYPE,
615 E_("spinner increment button")); 615 E_("spinner increment button"));
616 _elm_access_activate_callback_set(ai, _access_activate_cb, obj); 616 _elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@@ -619,7 +619,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
619 ao = _elm_access_edje_object_part_object_register 619 ao = _elm_access_edje_object_part_object_register
620 (obj, elm_layout_edje_get(obj), decrement_part); 620 (obj, elm_layout_edje_get(obj), decrement_part);
621 621
622 ai = _elm_access_object_get(ao); 622 ai = _elm_access_info_get(ao);
623 _elm_access_text_set(ai, ELM_ACCESS_TYPE, 623 _elm_access_text_set(ai, ELM_ACCESS_TYPE,
624 E_("spinner decrement button")); 624 E_("spinner decrement button"));
625 _elm_access_activate_callback_set(ai, _access_activate_cb, obj); 625 _elm_access_activate_callback_set(ai, _access_activate_cb, obj);
@@ -628,7 +628,7 @@ _access_spinner_register(Evas_Object *obj, Eina_Bool is_access)
628 ao = _elm_access_edje_object_part_object_register 628 ao = _elm_access_edje_object_part_object_register
629 (obj, elm_layout_edje_get(obj), "access_text"); 629 (obj, elm_layout_edje_get(obj), "access_text");
630 630
631 ai = _elm_access_object_get(ao); 631 ai = _elm_access_info_get(ao);
632 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner")); 632 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("spinner"));
633 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj); 633 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, obj);
634 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, obj); 634 _elm_access_callback_set(ai, ELM_ACCESS_STATE, _access_state_cb, obj);
diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/legacy/elementary/src/lib/elm_toolbar.c
index 7dece02740..19e63b76f8 100644
--- a/legacy/elementary/src/lib/elm_toolbar.c
+++ b/legacy/elementary/src/lib/elm_toolbar.c
@@ -2064,7 +2064,7 @@ _access_widget_item_register(Elm_Toolbar_Item *it)
2064{ 2064{
2065 Elm_Access_Info *ai; 2065 Elm_Access_Info *ai;
2066 _elm_access_widget_item_register((Elm_Widget_Item *)it); 2066 _elm_access_widget_item_register((Elm_Widget_Item *)it);
2067 ai = _elm_access_object_get(it->base.access_obj); 2067 ai = _elm_access_info_get(it->base.access_obj);
2068 2068
2069 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item")); 2069 _elm_access_text_set(ai, ELM_ACCESS_TYPE, E_("Toolbar Item"));
2070 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it); 2070 _elm_access_callback_set(ai, ELM_ACCESS_INFO, _access_info_cb, it);
diff --git a/legacy/elementary/src/lib/elm_widget.c b/legacy/elementary/src/lib/elm_widget.c
index 293f1e2518..d2262b241a 100644
--- a/legacy/elementary/src/lib/elm_widget.c
+++ b/legacy/elementary/src/lib/elm_widget.c
@@ -2646,7 +2646,7 @@ _elm_widget_focus_next_get(Eo *obj, void *_pd EINA_UNUSED, va_list *list)
2646 if (_elm_config->access_mode) 2646 if (_elm_config->access_mode)
2647 { 2647 {
2648 Elm_Access_Info *ac; 2648 Elm_Access_Info *ac;
2649 ac= _elm_access_object_get(obj); 2649 ac= _elm_access_info_get(obj);
2650 if (!ac) return; 2650 if (!ac) return;
2651 } 2651 }
2652 2652
diff --git a/legacy/elementary/src/lib/elm_widget.h b/legacy/elementary/src/lib/elm_widget.h
index 388b2db099..594580f85b 100644
--- a/legacy/elementary/src/lib/elm_widget.h
+++ b/legacy/elementary/src/lib/elm_widget.h
@@ -515,7 +515,7 @@ EAPI void _elm_access_callback_set(Elm_Access_Info *ac, int type, El
515EAPI char *_elm_access_text_get(const Elm_Access_Info *ac, int type, const Evas_Object *obj); /* this is ok it actually returns a strduped string - it's meant to! */ 515EAPI char *_elm_access_text_get(const Elm_Access_Info *ac, int type, const Evas_Object *obj); /* this is ok it actually returns a strduped string - it's meant to! */
516EAPI void _elm_access_read(Elm_Access_Info *ac, int type, const Evas_Object *obj); 516EAPI void _elm_access_read(Elm_Access_Info *ac, int type, const Evas_Object *obj);
517EAPI void _elm_access_say(const char *txt); 517EAPI void _elm_access_say(const char *txt);
518EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj); 518EAPI Elm_Access_Info *_elm_access_info_get(const Evas_Object *obj);
519EAPI void _elm_access_object_hilight(Evas_Object *obj); 519EAPI void _elm_access_object_hilight(Evas_Object *obj);
520EAPI void _elm_access_object_unhilight(Evas_Object *obj); 520EAPI void _elm_access_object_unhilight(Evas_Object *obj);
521EAPI void _elm_access_object_hilight_disable(Evas *e); 521EAPI void _elm_access_object_hilight_disable(Evas *e);
@@ -532,6 +532,8 @@ EAPI void _elm_access_activate_callback_set(Elm_Access_Info *ac, Elm
532EAPI void _elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act); 532EAPI void _elm_access_highlight_object_activate(Evas_Object *obj, Elm_Activate act);
533EAPI void _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir); 533EAPI void _elm_access_highlight_cycle(Evas_Object *obj, Elm_Focus_Direction dir);
534 534
535EINA_DEPRECATED EAPI Elm_Access_Info *_elm_access_object_get(const Evas_Object *obj);
536
535#define ELM_PREFS_DATA_MAGIC 0xe1f5da7a 537#define ELM_PREFS_DATA_MAGIC 0xe1f5da7a
536 538
537/**< put this as the first member in your widget item struct */ 539/**< put this as the first member in your widget item struct */
diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
index d5595edd77..838440a94c 100644
--- a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+++ b/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c
@@ -247,9 +247,9 @@ _access_set(Evas_Object *obj, Elm_Datetime_Field_Type field_type)
247 } 247 }
248 248
249 _elm_access_text_set 249 _elm_access_text_set
250 (_elm_access_object_get(obj), ELM_ACCESS_TYPE, type); 250 (_elm_access_info_get(obj), ELM_ACCESS_TYPE, type);
251 _elm_access_callback_set 251 _elm_access_callback_set
252 (_elm_access_object_get(obj), ELM_ACCESS_STATE, NULL, NULL); 252 (_elm_access_info_get(obj), ELM_ACCESS_STATE, NULL, NULL);
253} 253}
254 254
255// module fucns for the specific module type 255// module fucns for the specific module type