diff options
author | Lukasz Stanislawski <l.stanislaws@samsung.com> | 2016-01-13 11:56:25 +0100 |
---|---|---|
committer | Lukasz Stanislawski <l.stanislaws@samsung.com> | 2016-01-13 12:09:21 +0100 |
commit | 3c7ef7e2145d1b29fffa9ddea390a1d830711f32 (patch) | |
tree | 21bfdeb411cad3492b7d0465cff248c16d362738 | |
parent | 17553e2a3572d943ebe1a0aa72eba8ec29add857 (diff) | |
download | elementary-3c7ef7e2145d1b29fffa9ddea390a1d830711f32.tar.gz |
atspi: remove description set operation
description set and get functions are already implemented in base
class.
-rw-r--r-- | src/lib/elm_atspi_app_object.c | 49 | ||||
-rw-r--r-- | src/lib/elm_atspi_app_object.eo | 4 |
2 files changed, 20 insertions, 33 deletions
diff --git a/src/lib/elm_atspi_app_object.c b/src/lib/elm_atspi_app_object.c index 11d5bb2f5..f1af9081f 100644 --- a/src/lib/elm_atspi_app_object.c +++ b/src/lib/elm_atspi_app_object.c @@ -10,23 +10,8 @@ extern Eina_List *_elm_win_list; -typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data; - -struct _Elm_Atspi_App_Object_Data -{ - const char *descr; -}; - -EOLIAN static void -_elm_atspi_app_object_eo_base_destructor(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) -{ - if (_pd->descr) eina_stringshare_del(_pd->descr); - - eo_do_super(obj, ELM_ATSPI_APP_OBJECT_CLASS, eo_destructor()); -} - EOLIAN static Eina_List* -_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { Eina_List *l, *accs = NULL; Evas_Object *win; @@ -45,29 +30,33 @@ _elm_atspi_app_object_elm_interface_atspi_accessible_children_get(Eo *obj EINA_U } EOLIAN static char* -_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) +_elm_atspi_app_object_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { - const char *ret; - ret = elm_app_name_get(); - return ret ? strdup(ret) : NULL; + char *name; + + eo_do_super(obj, ELM_ATSPI_APP_OBJECT_CLASS, name = elm_interface_atspi_accessible_name_get()); + if (name) return name; + + return strdup(elm_app_name_get()); } -EOLIAN static const char* -_elm_atspi_app_object_elm_interface_atspi_accessible_description_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd) +EOLIAN static Elm_Atspi_Role +_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED) { - return _pd->descr; + return ELM_ATSPI_ROLE_APPLICATION; } EOLIAN static void -_elm_atspi_app_object_elm_interface_atspi_accessible_description_set(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED, const char *descr) +_elm_atspi_app_object_eo_base_destructor(Eo *obj, void *pd EINA_UNUSED) { - eina_stringshare_replace(&_pd->descr, descr); -} + eo_do(obj, + elm_interface_atspi_accessible_description_set(NULL), + elm_interface_atspi_accessible_name_set(NULL), + elm_interface_atspi_accessible_translation_domain_set(NULL), + elm_interface_atspi_accessible_relationships_clear() + ); -EOLIAN static Elm_Atspi_Role -_elm_atspi_app_object_elm_interface_atspi_accessible_role_get(Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) -{ - return ELM_ATSPI_ROLE_APPLICATION; + eo_do_super(obj, ELM_ATSPI_APP_OBJECT_CLASS, eo_destructor()); } #include "elm_atspi_app_object.eo.c" diff --git a/src/lib/elm_atspi_app_object.eo b/src/lib/elm_atspi_app_object.eo index 5371535db..ff19696ab 100644 --- a/src/lib/elm_atspi_app_object.eo +++ b/src/lib/elm_atspi_app_object.eo @@ -1,11 +1,9 @@ class Elm_Atspi_App_Object (Eo.Base, Elm_Interface_Atspi_Accessible) { - data: Elm_Atspi_App_Object_Data; + data: null; implements { Eo.Base.destructor; Elm_Interface_Atspi_Accessible.name.get; - Elm_Interface_Atspi_Accessible.description.get; - Elm_Interface_Atspi_Accessible.description.set; Elm_Interface_Atspi_Accessible.role.get; Elm_Interface_Atspi_Accessible.children.get; } |