From abb3f5b9beb030b238b5813b844a531a8d7c4c5e Mon Sep 17 00:00:00 2001 From: "yh106.jung" Date: Sun, 24 Sep 2023 18:38:20 -0700 Subject: [PATCH] Always initialize eldbus eldbus has been used not only in ATX but also in clipboard, so this patch always initailize edbus. Change-Id: If19a25f676bc57b61c32c5d18fb8b4a7df29f499 Signed-off-by: yh106.jung --- tizen_src/ewk/efl_integration/public/ewk_main.cc | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tizen_src/ewk/efl_integration/public/ewk_main.cc b/tizen_src/ewk/efl_integration/public/ewk_main.cc index 87d38a5..05a292c 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_main.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_main.cc @@ -25,11 +25,9 @@ #include #include #include +#include #include -#if defined(TIZEN_ATK_SUPPORT) -#include -#endif #include "command_line_efl.h" #include "eweb_context.h" @@ -130,20 +128,16 @@ int ewk_init(void) ERR("Could not init edje."); goto error_edje; } -#if defined(TIZEN_ATK_SUPPORT) if (!eldbus_init()) { CRITICAL("Could not load eldbus"); goto error_eldbus; } -#endif _ewk_init_web_engine(); return ++_ewkInitCount; -#if defined(TIZEN_ATK_SUPPORT) error_eldbus: edje_shutdown(); -#endif error_edje: #if defined(USE_WAYLAND) @@ -184,9 +178,8 @@ int ewk_shutdown(void) _ewk_shutdown_web_engine(); -#if defined(TIZEN_ATK_SUPPORT) eldbus_shutdown(); -#endif + edje_shutdown(); #if defined(USE_WAYLAND) #if TIZEN_VERSION_AT_LEAST(5, 0, 0) @@ -259,4 +252,4 @@ void _ewk_force_acceleration() // app which does not call elm_config_accel_preference_set() function will // fail to execute. setenv("ELM_ACCEL", "hw", 1); -} \ No newline at end of file +} -- 2.7.4