From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Wed, 25 May 2016 10:39:18 +0000 (+0200)
Subject: Fix StepParse for tizen:service icon
X-Git-Tag: accepted/tizen/common/20160621.184529^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e82d90ac3087342e09f4dc5d81167aebb32c5119;p=platform%2Fcore%2Fappfw%2Fwgt-backend.git

Fix StepParse for tizen:service icon

According to 782d65d706b0bc46e12a2e041a9331893c788f6c
icon path should be always set with full path.

To verify:
 - install widget with <tizen:service> tag and check shared/res/ for icons
   there should be one per tizen:service and one for widget itself.

Change-Id: I58d61c447b88a70de34faabaff81c07133f4cfe4
---

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index 51c86ca..5e1a677 100644
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -343,8 +343,10 @@ bool StepParse::FillServiceApplicationInfo(manifest_x* manifest) {
     }
 
     if (!service_info.icon().empty()) {
+      bf::path icon_path = context_->root_application_path.get()
+          / manifest->package / "res" / "wgt" / service_info.icon();
       icon_x* icon = reinterpret_cast<icon_x*>(calloc(1, sizeof(icon_x)));
-      icon->text = strdup(service_info.icon().c_str());
+      icon->text = strdup(icon_path.c_str());
       icon->lang = strdup(DEFAULT_LOCALE);
       application->icon = g_list_append(application->icon, icon);
     }
diff --git a/src/wgt/step/filesystem/step_wgt_patch_icons.cc b/src/wgt/step/filesystem/step_wgt_patch_icons.cc
index d9a1827..5bcb229 100644
--- a/src/wgt/step/filesystem/step_wgt_patch_icons.cc
+++ b/src/wgt/step/filesystem/step_wgt_patch_icons.cc
@@ -13,10 +13,6 @@ namespace bf = boost::filesystem;
 namespace bs = boost::system;
 namespace ci = common_installer;
 
-namespace {
-const char kResWgt[] = "res/wgt";
-}  // namespace
-
 namespace wgt {
 namespace filesystem {