summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-02-13 23:43:53 +0100
committerLukasz Stanislawski <lukasz.stanislawski@gmail.com>2019-02-13 23:43:53 +0100
commite18d8dd2ac345fd5ace76d6bf511a979339078f8 (patch)
tree42315a45a4ecd9c8c14dba1ce89927822b1ffc2f
parentc9bd71d92614a18b6d0f3c7330a123712849f1b6 (diff)
efl_access: refactor Elm.Atspi.App.Object class
-rw-r--r--src/lib/elementary/elm_atspi_app_object.c5
-rw-r--r--src/lib/elementary/elm_main.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c
index 3f4261df57..622c7d834a 100644
--- a/src/lib/elementary/elm_atspi_app_object.c
+++ b/src/lib/elementary/elm_atspi_app_object.c
@@ -48,9 +48,8 @@ _elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_U
48 48
49 EINA_LIST_FOREACH(_elm_win_list, l, win) 49 EINA_LIST_FOREACH(_elm_win_list, l, win)
50 { 50 {
51 if (!efl_isa(win, EFL_ACCESS_OBJECT_MIXIN)) 51 Efl_Access_Object *access = efl_access_object_query(EFL_ACCESS_OBJECT_MIXIN, win);
52 continue; 52 if (access) accs = eina_list_append(accs, access);
53 accs = eina_list_append(accs, win);
54 } 53 }
55 54
56 return accs; 55 return accs;
diff --git a/src/lib/elementary/elm_main.c b/src/lib/elementary/elm_main.c
index 58b2d850ec..7fe03fe638 100644
--- a/src/lib/elementary/elm_main.c
+++ b/src/lib/elementary/elm_main.c
@@ -428,7 +428,10 @@ elm_init(int argc, char **argv)
428 ELM_CNP_EVENT_SELECTION_CHANGED = ecore_event_type_new(); 428 ELM_CNP_EVENT_SELECTION_CHANGED = ecore_event_type_new();
429 429
430 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF) 430 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF)
431 _elm_atspi_bridge_init(); 431 {
432 _elm_access_init();
433 _elm_atspi_bridge_init();
434 }
432 if (!_elm_config->web_backend) 435 if (!_elm_config->web_backend)
433 _elm_config->web_backend = eina_stringshare_add("none"); 436 _elm_config->web_backend = eina_stringshare_add("none");
434 if (!_elm_web_init(_elm_config->web_backend)) 437 if (!_elm_web_init(_elm_config->web_backend))
@@ -1207,7 +1210,10 @@ elm_quicklaunch_fork(int argc,
1207 if (setsid() < 0) perror("could not setsid"); 1210 if (setsid() < 0) perror("could not setsid");
1208 if (chdir(cwd) != 0) perror("could not chdir"); 1211 if (chdir(cwd) != 0) perror("could not chdir");
1209 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF) 1212 if (_elm_config->atspi_mode != ELM_ATSPI_MODE_OFF)
1210 _elm_atspi_bridge_init(); 1213 {
1214 _elm_access_init();
1215 _elm_atspi_bridge_init();
1216 }
1211 1217
1212 if (qre_main) 1218 if (qre_main)
1213 { 1219 {