From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Wed, 1 Jun 2016 13:21:01 +0000 (+0200)
Subject: Fix handling widget-application icon
X-Git-Tag: accepted/tizen/common/20160610.175852^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e280cc1044f62892d6003ede6473de9f15f08f5;p=platform%2Fcore%2Fappfw%2Fapp-installers.git

Fix handling widget-application icon

Icon name should match appid. Checking by prefix is invalid.

Change-Id: I2b3894e868f7ff9a26b7139f8463593e978e8b3d
---

diff --git a/src/common/step/backup/step_backup_icons.cc b/src/common/step/backup/step_backup_icons.cc
index 73c61f4..1aa4cdb 100644
--- a/src/common/step/backup/step_backup_icons.cc
+++ b/src/common/step/backup/step_backup_icons.cc
@@ -31,8 +31,10 @@ Step::Status StepBackupIcons::process() {
     for (application_x* app : GListRange<application_x*>(
         context_->old_manifest_data.get()->application)) {
       if (app->icon) {
-        std::string filename = iter->path().filename().string();
-        if (filename.find(app->appid) == 0) {
+        bf::path filename = iter->path().filename();
+        filename.replace_extension();
+        std::string id = filename.string();
+        if (id == app->appid) {
           bf::path icon_backup = GetBackupPathForIconFile(iter->path());
           icons_.emplace_back(iter->path(), icon_backup);
         }