From 97917b7118e5fc42df3d9689e40c03760c6e6c7c Mon Sep 17 00:00:00 2001
From: Junghoon Park <jh9216.park@samsung.com>
Date: Mon, 31 Dec 2018 00:50:13 +0000
Subject: [PATCH] Revert "Postpone vc elm initialization"

This reverts commit 2fc6321e32154da40ff3969a3443e0d444e7778d.

Change-Id: Id62ea158061ebc4e18a82778c856e7c2bb91f1fb
---
 src/efl_base/appcore_efl_base.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/efl_base/appcore_efl_base.c b/src/efl_base/appcore_efl_base.c
index 0e8dde5..676cb71 100644
--- a/src/efl_base/appcore_efl_base.c
+++ b/src/efl_base/appcore_efl_base.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <dlfcn.h>
-#include <glib.h>
 #include <Elementary.h>
 #include <vconf.h>
 
@@ -142,14 +141,6 @@ static void __vc_elm_finish(void)
 	}
 }
 
-static gboolean __init_vc_elm(gpointer data)
-{
-	/* VC voice touch setting */
-	__vc_elm_init();
-
-	return G_SOURCE_REMOVE;
-}
-
 static void __efl_app_init(int argc, char **argv, void *data)
 {
 	int hint;
@@ -173,13 +164,15 @@ static void __efl_app_init(int argc, char **argv, void *data)
 		}
 	}
 
-	/* Postpone initialization to improve app launching performance */
-	g_idle_add(__init_vc_elm, NULL);
+	/* VC voice touch setting */
+	if (!getenv("VC_ELM_INIT"))
+		__vc_elm_init();
 }
 
 static void __efl_app_finish(void)
 {
 	__vc_elm_finish();
+	unsetenv("VC_ELM_INIT");
 
 	elm_shutdown();
 
-- 
2.7.4