Fix handling widget-application icon 73/72573/2 accepted/tizen/common/20160610.175852 accepted/tizen/ivi/20160609.091408 accepted/tizen/mobile/20160609.091542 accepted/tizen/tv/20160609.091345 accepted/tizen/wearable/20160609.091320 submit/tizen/20160609.010102
authorTomasz Iwanek <t.iwanek@samsung.com>
Wed, 1 Jun 2016 13:21:01 +0000 (15:21 +0200)
committerjongmyeong ko <jongmyeong.ko@samsung.com>
Wed, 8 Jun 2016 00:45:17 +0000 (17:45 -0700)
Icon name should match appid. Checking by prefix is invalid.

Change-Id: I2b3894e868f7ff9a26b7139f8463593e978e8b3d

src/common/step/backup/step_backup_icons.cc

index 73c61f4..1aa4cdb 100644 (file)
@@ -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);
         }