From 2a28f1300a8cd22766a46cd55de47615a5567264 Mon Sep 17 00:00:00 2001
From: Jihoon Kim <jihoon48.kim@samsung.com>
Date: Tue, 23 Jun 2020 20:33:09 +0900
Subject: [PATCH] Remove ecore_file dependency for reducing memory usage

Change-Id: I29671c7fe4713d10d29a9ea63a09d863348160f7
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>
---
 configure.ac                           |  5 +----
 ism/extras/efl_panel/Makefile.am       |  4 ++--
 ism/extras/efl_panel/isf_panel_efl.cpp | 11 +++++------
 packaging/isf.spec                     |  1 -
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 06b4409..3668a8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,10 +220,7 @@ PKG_CHECK_MODULES(ECORE, [ecore])
 # Check ECORE_IPC library
 PKG_CHECK_MODULES(ECORE_IPC, [ecore-ipc])
 
-# Check ECORE FILE library
-PKG_CHECK_MODULES(ECORE_FILE, [ecore-file])
-
-# Check ECORE FILE library
+# Check ECORE INPUT library
 PKG_CHECK_MODULES(ECORE_INPUT, [ecore-input])
 
 # Check ECORE EVAS library
diff --git a/ism/extras/efl_panel/Makefile.am b/ism/extras/efl_panel/Makefile.am
index 6b82f28..487f715 100644
--- a/ism/extras/efl_panel/Makefile.am
+++ b/ism/extras/efl_panel/Makefile.am
@@ -42,7 +42,6 @@ endif
 isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
                          @ECORE_WL_CFLAGS@ \
                          @ECORE_CFLAGS@ \
-                         @ECORE_FILE_CFLAGS@ \
                          @ECORE_IMF_CFLAGS@ \
                          @EINA_CFLAGS@ \
                          @VCONF_CFLAGS@ \
@@ -56,6 +55,7 @@ isf_panel_efl_CXXFLAGS = @ECOREX_CFLAGS@ \
                          @XKBCOMMON_CFLAGS@ \
                          @APP_CONTROL_CFLAGS@ \
                          @PKGMGR_INFO_CFLAGS@ \
+                         @PACKAGE_MANAGER_CFLAGS@ \
                          @AUL_CFLAGS@ \
                          @SYSTEM_INFO_CFLAGS@ \
                          -fPIE
@@ -64,7 +64,6 @@ isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
                          @ECOREX_LIBS@ \
                          @ECORE_WL_LIBS@ \
                          @ECORE_LIBS@ \
-                         @ECORE_FILE_LIBS@ \
                          @ECORE_IMF_LIBS@ \
                          @EINA_LIBS@ \
                          @VCONF_LIBS@ \
@@ -78,6 +77,7 @@ isf_panel_efl_LDFLAGS  = @LTLIBINTL@ -rpath $(libdir) \
                          @XKBCOMMON_LIBS@ \
                          @APP_CONTROL_LIBS@ \
                          @PKGMGR_INFO_LIBS@ \
+                         @PACKAGE_MANAGER_LIBS@ \
                          @AUL_LIBS@ \
                          @SYSTEM_INFO_LIBS@ \
                          -pie
diff --git a/ism/extras/efl_panel/isf_panel_efl.cpp b/ism/extras/efl_panel/isf_panel_efl.cpp
index c8d1c58..b61034b 100644
--- a/ism/extras/efl_panel/isf_panel_efl.cpp
+++ b/ism/extras/efl_panel/isf_panel_efl.cpp
@@ -39,13 +39,12 @@
 #include <string.h>
 #include <Eina.h>
 #include <Ecore.h>
-#include <Ecore_File.h>
 #include <malloc.h>
+#include <glib.h>
 #include "scim_private.h"
 #include "scim.h"
 #include "scim_stl_map.h"
 #if ISF_BUILD_CANDIDATE_UI
-#include <glib.h>
 #include <Elementary.h>
 #include <Evas.h>
 #ifdef HAVE_ECOREWL
@@ -7621,8 +7620,8 @@ static String sanitize_string (const char *str, int maxlen = 32)
 static Eina_Bool monitor_user_data_path_timer(void *data)
 {
     const char *path = static_cast<const char*>(data);
-    bool user_data_path_exists = ecore_file_exists (path);
-    bool user_data_path_is_dir = ecore_file_is_dir (path);
+    bool user_data_path_exists = g_file_test (path, G_FILE_TEST_EXISTS);
+    bool user_data_path_is_dir = g_file_test (path, G_FILE_TEST_IS_DIR);
     if (user_data_path_exists && user_data_path_is_dir) {
         LOGW ("'%s' exists : %d, is_dir : %d", path,
              (user_data_path_exists ? 1 : 0), (user_data_path_is_dir ? 1 : 0));
@@ -7911,8 +7910,8 @@ int main (int argc, char *argv [])
 
     /* Load ISF configuration */
     user_data_path = scim_get_user_data_dir ();
-    user_data_path_exists = ecore_file_exists (user_data_path.c_str ());
-    user_data_path_is_dir = ecore_file_is_dir (user_data_path.c_str ());
+    user_data_path_exists = g_file_test (user_data_path.c_str(), G_FILE_TEST_EXISTS);
+    user_data_path_is_dir = g_file_test (user_data_path.c_str(), G_FILE_TEST_IS_DIR);
     _launch_ise_on_request = scim_global_config_read (String (SCIM_GLOBAL_CONFIG_LAUNCH_ISE_ON_REQUEST), _launch_ise_on_request);
     if (vconf_set_bool (VCONFKEY_ISF_IME_LAUNCH_ON_DEMAND, _launch_ise_on_request) != 0)
         LOGW ("Failed to set vconf key");
diff --git a/packaging/isf.spec b/packaging/isf.spec
index 16a1ea5..1b0f9ae 100644
--- a/packaging/isf.spec
+++ b/packaging/isf.spec
@@ -25,7 +25,6 @@ BuildRequires:  pkgconfig(tts)
 %endif
 BuildRequires:  pkgconfig(eina)
 BuildRequires:  pkgconfig(ecore)
-BuildRequires:  pkgconfig(ecore-file)
 BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(edje)
 BuildRequires:  pkgconfig(dlog)
-- 
2.7.4