[FIX] web application launch

Change-Id: I9384ae586a89797f6bd9a687948ac406e24e31ef
Signed-off-by: Anatolii Nikulin <nikulin.a@samsung.com>

diff --git a/daemon/utils.c b/daemon/utils.c
index fca624d..5669986 100644 (file)
--- a/daemon/utils.c
+++ b/daemon/utils.c
@@ -263,7 +263,7 @@ int exec_app_web(const char *app_id)
 
        LOGI("wrt-launcher path is %s,\n"
             "wrt-launcher name (%s), app_id (%s)\n",
-            WRT_LAUNCHER_PATH, WRT_LAUNCHER_NAME, app_id);
+            APP_LAUNCHER_PATH, APP_LAUNCHER_NAME, app_id);
 
        pid = fork();
        if (pid == -1)
@@ -277,24 +277,24 @@ int exec_app_web(const char *app_id)
                return 0;
        } else { /* child */
                char *web_argv_with_profile[] = {
-                       WRT_LAUNCHER_NAME,
+                       APP_LAUNCHER_NAME,
+                       "-w"
                        "-s",
-                       "-k",
                        (char *)app_id,
                        NULL
                };
                char *web_argv[] = {
-                       WRT_LAUNCHER_NAME,
+                       APP_LAUNCHER_NAME,
                        "-s",
                        (char *)app_id,
                        NULL
                };
 
                if (is_feature_enabled(FL_WEB_PROFILING))
-                       exec_with_user(EXEC_USER, WRT_LAUNCHER_PATH,
+                       exec_with_user(EXEC_USER, APP_LAUNCHER_PATH,
                                       web_argv_with_profile);
                else
-                       exec_with_user(EXEC_USER, WRT_LAUNCHER_PATH, web_argv);
+                       exec_with_user(EXEC_USER, APP_LAUNCHER_PATH, web_argv);
        }
 
        return 0;
@@ -306,7 +306,7 @@ void kill_app_web(const char *app_id)
 
        LOGI("wrt-launcher path is %s,\n"
             "wrt-launcher name (%s), app_id (%s)\n",
-            WRT_LAUNCHER_PATH, WRT_LAUNCHER_NAME, app_id);
+            APP_LAUNCHER_PATH, APP_LAUNCHER_NAME, app_id);
 
        pid = fork();
        if (pid == -1)
@@ -319,9 +319,9 @@ void kill_app_web(const char *app_id)
                while (ret == -1 && errno == EINTR);
                return;
        } else { /* child */
-               execl(WRT_LAUNCHER_PATH,
-                     WRT_LAUNCHER_NAME,
-                     WRT_LAUNCHER_KILL,
+               execl(APP_LAUNCHER_PATH,
+                     APP_LAUNCHER_NAME,
+                     "-k",
                      app_id,
                      NULL);
                /* FIXME: If code flows here, it deserves greater attention */

diff --git a/daemon/utils.h b/daemon/utils.h
index a520a7e..61e2178 100644 (file)
--- a/daemon/utils.h
+++ b/daemon/utils.h
@@ -42,11 +42,8 @@ extern "C" {
 #define LAUNCH_APP_PATH                        "/usr/bin/launch_app"
 #define DEBUG_LAUNCH_PRELOAD_PATH      "/usr/bin/debug_launchpad_preloading_preinitializing_daemon"
 #define LAUNCH_APP_NAME                        "launch_app"
-#define WRT_LAUNCHER_PATH              "/usr/bin/wrt-launcher"
-#define WRT_LAUNCHER_NAME              "wrt-launcher"
-#define WRT_LAUNCHER_START             "-s"
-#define WRT_LAUNCHER_START_DEBUG       "-d -s"
-#define WRT_LAUNCHER_KILL              "-k"
+#define APP_LAUNCHER_PATH              "/usr/bin/app_launcher"
+#define APP_LAUNCHER_NAME              "app_launcher"
 #define LAUNCH_APP_SDK                 "__AUL_SDK__"
 #define DA_PRELOAD_EXEC                        "DYNAMIC_ANALYSIS"
 #define DA_PRELOAD_TIZEN               "LD_PRELOAD=/usr/lib/da_probe_tizen.so"