From 15b5d0e6da4b92f34237aacc24b9f40a6bb080d8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Artur=20=C5=9Awigo=C5=84?= Date: Tue, 2 Aug 2022 12:29:16 +0200 Subject: [PATCH] Revert "elm_atspi: Return package name as application name" This reverts commit 51bab9ec39dbf2c797620901df704119464c3a1f. @tizen_only Change-Id: I4724e87d95bff27809b9601ad8c3eba8021543d9 --- packaging/efl.spec | 1 - src/lib/elementary/elm_atspi_app_object.c | 27 +++------------------------ src/lib/elementary/meson.build | 2 +- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/packaging/efl.spec b/packaging/efl.spec index 43af964..d5c00a2 100644 --- a/packaging/efl.spec +++ b/packaging/efl.spec @@ -29,7 +29,6 @@ BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(zlib) BuildRequires: gettext-tools BuildRequires: hyphen-devel -BuildRequires: pkgconfig(aul) BuildRequires: meson >= 0.49.0 diff --git a/src/lib/elementary/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c index 3da5b7e..b06a112 100644 --- a/src/lib/elementary/elm_atspi_app_object.c +++ b/src/lib/elementary/elm_atspi_app_object.c @@ -6,10 +6,6 @@ #include "elm_priv.h" -//TIZEN_ONLY(20220728): Return package name as application name -#include -// - extern Eina_List *_elm_win_list; typedef struct _Elm_Atspi_App_Object_Data Elm_Atspi_App_Object_Data; @@ -61,26 +57,9 @@ _elm_atspi_app_object_efl_access_object_access_children_get(const Eo *obj EINA_U EOLIAN static const char* _elm_atspi_app_object_efl_access_object_i18n_name_get(const Eo *obj EINA_UNUSED, Elm_Atspi_App_Object_Data *_pd EINA_UNUSED) { - //TIZEN_ONLY(20220728): Return package name as application name - //const char *ret; - //ret = elm_app_name_get(); - //return ret; - static char buffer[4096]; - static const char *app_name; - - if (!app_name) - { - int ret; - ret = aul_app_get_pkgname_bypid(getpid(), buffer, sizeof(buffer)); - - if (ret == AUL_R_OK) - app_name = buffer; - else - app_name = elm_app_name_get(); - } - - return app_name; - // + const char *ret; + ret = elm_app_name_get(); + return ret; } EOLIAN static const char* diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build index 80ae571..9973d28 100644 --- a/src/lib/elementary/meson.build +++ b/src/lib/elementary/meson.build @@ -1058,7 +1058,7 @@ elementary_src_tizen = elementary_src_tizen_tmp elementary_deps = [emile, eo, efl, edje, ethumb, ethumb_client, emotion, ecore_imf, ecore_con, eldbus, efreet, eio, buildsystem] elementary_pub_deps = [eina, eet, evas, ecore, ecore_evas, ecore_file, ecore_input, ecore_imf, ecore_con, edje, eldbus, efreet, ethumb_client, efl] -elementary_ext_deps = [atspi, dependency('aul'), dl, intl, buildsystem_simple] +elementary_ext_deps = [atspi, dl, intl, buildsystem_simple] elm_options = configuration_data() config_h.set_quoted('ELM_TOP_BUILD_DIR', meson.build_root()) -- 2.7.4