get name for launching app from app-utils

Change-Id: I5730c8a91aadbae0486697ce9c9afb6798a25eea
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>

diff --git a/include/define.h b/include/define.h
index cc46ce6..b0a87c9 100644 (file)
--- a/include/define.h
+++ b/include/define.h
@@ -84,12 +84,7 @@
 #define STR_CNT_MUSIC "songs"
 #define STR_CNT_APPS "apps"
 #define STR_CNT_WEBS "bookmark"
-#define STR_MEDIAHUB_APP_ID "org.tizen.mediahub"
-#define STR_LIVETV_APP_ID "org.tizen.live-tv"
-#define STR_KEY_MEDIA_ID "media_id"
-#define STR_KEY_SERVICE_ID "service_id"
 #define STR_BROWSER "Web Browser"
-#define STR_BROWSER_ID "org.tizen.browser"
 #define STR_LIVETV "Live TV"
 
 /* Font */

diff --git a/src/data/app.c b/src/data/app.c
index 4ba5330..d73a69c 100644 (file)
--- a/src/data/app.c
+++ b/src/data/app.c
@@ -19,6 +19,7 @@
 #include <pkgmgr-info.h>
 #include <app_contents.h>
 #include <app_debug.h>
+#include <app_define.h>
 
 #include "datamgr.h"
 #include "define.h"
@@ -75,7 +76,7 @@ static void _app_favorite_list_foreach(gpointer data, gpointer user_data)
                adata->icon = strdup(icon);
 
        /* FIXME: The browser's name and icon is defined as GUI. */
-       if (!strcmp(id, STR_BROWSER_ID)) {
+       if (!strcmp(id, APP_ID_BROWSER)) {
                adata->name = STR_BROWSER;
                adata->icon = BROWSER_ICON_PNG;
        }

diff --git a/src/data/channel.c b/src/data/channel.c
index 5c0a138..b18b6d0 100644 (file)
--- a/src/data/channel.c
+++ b/src/data/channel.c
@@ -18,6 +18,7 @@
 #include <Elementary.h>
 #include <tv_service_proxy_channel_info.h>
 #include <app_debug.h>
+#include <app_define.h>
 
 #include "define.h"
 #include "datamgr.h"
@@ -191,8 +192,7 @@ static bool _action(Elm_Object_Item *it, enum action_type type)
        case ACTION_LAUNCH:
                snprintf(str, sizeof(str), "%d", cdata->id);
 
-               if (!utils_launch_app(STR_LIVETV_APP_ID,
-                                       STR_KEY_SERVICE_ID, str)) {
+               if (!utils_launch_app(APP_ID_LIVETV, PARAM_SERVICE_ID, str)) {
                        _ERR("Livetv launch failed.");
                        return false;
                }

diff --git a/src/data/media.c b/src/data/media.c
index de3d126..0cb365f 100644 (file)
--- a/src/data/media.c
+++ b/src/data/media.c
@@ -19,6 +19,7 @@
 #include <app_contents.h>
 #include <app_media.h>
 #include <app_debug.h>
+#include <app_define.h>
 
 #include "define.h"
 #include "datamgr.h"
@@ -249,7 +250,7 @@ static bool _action(Elm_Object_Item *it, enum action_type type)
 
        switch (type) {
        case ACTION_LAUNCH:
-               if (!utils_launch_app(STR_MEDIAHUB_APP_ID, STR_KEY_MEDIA_ID,
+               if (!utils_launch_app(APP_ID_MEDIAHUB, PARAM_MEDIA_ID,
                                        minfo->media_id)) {
                        _ERR("Mediahub launch failed.");
                        return false;