diff options
author | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 17:14:19 +0900 |
---|---|---|
committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2017-09-26 17:58:07 +0900 |
commit | e401b223f8813587ddb7d370f199c88ba2cf23e7 (patch) | |
tree | 18dfe9834f852ecbf733a2f64283a8353f7f382e | |
parent | 0ae529ac196a5b212e2b7386aef9978c4cfa095c (diff) |
elm: Delete atspi root object on shutdown
Ugly implementation but this will do.
@fix
-rw-r--r-- | src/lib/elementary/elm_atspi_bridge.c | 1 | ||||
-rw-r--r-- | src/lib/elementary/elm_interface_atspi_accessible.c | 6 | ||||
-rw-r--r-- | src/lib/elementary/elm_priv.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/lib/elementary/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c index 8ff4f1231b..09247fdc52 100644 --- a/src/lib/elementary/elm_atspi_bridge.c +++ b/src/lib/elementary/elm_atspi_bridge.c | |||
@@ -4486,6 +4486,7 @@ _elm_atspi_bridge_shutdown(void) | |||
4486 | efl_del(_instance); | 4486 | efl_del(_instance); |
4487 | _init_count = 0; | 4487 | _init_count = 0; |
4488 | } | 4488 | } |
4489 | _elm_interface_atspi_shutdown(); | ||
4489 | } | 4490 | } |
4490 | 4491 | ||
4491 | static Key_Event_Info* | 4492 | static Key_Event_Info* |
diff --git a/src/lib/elementary/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c index 09ddea8ffe..a98f69b7a5 100644 --- a/src/lib/elementary/elm_interface_atspi_accessible.c +++ b/src/lib/elementary/elm_interface_atspi_accessible.c | |||
@@ -609,4 +609,10 @@ _elm_interface_atspi_accessible_efl_object_destructor(Eo *obj, Elm_Interface_Ats | |||
609 | efl_destructor(efl_super(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); | 609 | efl_destructor(efl_super(obj, ELM_INTERFACE_ATSPI_ACCESSIBLE_MIXIN)); |
610 | } | 610 | } |
611 | 611 | ||
612 | void | ||
613 | _elm_interface_atspi_shutdown(void) | ||
614 | { | ||
615 | ELM_SAFE_DEL(root); | ||
616 | } | ||
617 | |||
612 | #include "elm_interface_atspi_accessible.eo.c" | 618 | #include "elm_interface_atspi_accessible.eo.c" |
diff --git a/src/lib/elementary/elm_priv.h b/src/lib/elementary/elm_priv.h index 6291b55144..8d905ca913 100644 --- a/src/lib/elementary/elm_priv.h +++ b/src/lib/elementary/elm_priv.h | |||
@@ -547,6 +547,8 @@ void _elm_win_wl_cursor_set(Evas_Object *obj, const char *cursor | |||
547 | void _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, Eo *obj); | 547 | void _efl_ui_focus_manager_redirect_events_del(Efl_Ui_Focus_Manager *manager, Eo *obj); |
548 | void _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, Eo *obj); | 548 | void _efl_ui_focus_manager_redirect_events_add(Efl_Ui_Focus_Manager *manager, Eo *obj); |
549 | 549 | ||
550 | void _elm_interface_atspi_shutdown(void); | ||
551 | |||
550 | /* Combobox: no proper support for Efl.Part API yet. */ | 552 | /* Combobox: no proper support for Efl.Part API yet. */ |
551 | void _elm_combobox_part_text_set(Eo *obj, const char * part, const char *label); | 553 | void _elm_combobox_part_text_set(Eo *obj, const char * part, const char *label); |
552 | const char *_elm_combobox_part_text_get(const Eo *obj, const char *part); | 554 | const char *_elm_combobox_part_text_get(const Eo *obj, const char *part); |