Fix for finding proper extension for icon

Change-Id: I3336ffccc8dbab996f697d9ecd43eeffca5aa7a2

diff --git a/src/common/step/step_backup_icons.cc b/src/common/step/step_backup_icons.cc
index e34808a..6e2758f 100755 (executable)
--- a/src/common/step/step_backup_icons.cc
+++ b/src/common/step/step_backup_icons.cc
@@ -25,8 +25,8 @@ Step::Status StepBackupIcons::process() {
   for (; ui != nullptr; ui = ui->next) {
     bf::path app_icon = bf::path(getIconPath(context_->uid.get()))
         / bf::path(ui->appid);
-    if (ui->icon && ui->icon->name)
-      app_icon += bf::path(ui->icon->name).extension();
+    if (ui->icon && ui->icon->text)
+      app_icon += bf::path(ui->icon->text).extension();
     else
       app_icon += ".png";
     bf::path icon_backup = GetBackupPathForIconFile(app_icon);

diff --git a/src/common/step/step_create_icons.cc b/src/common/step/step_create_icons.cc
index a683606..0e0779a 100644 (file)
--- a/src/common/step/step_create_icons.cc
+++ b/src/common/step/step_create_icons.cc
@@ -33,8 +33,8 @@ Step::Status StepCreateIcons::process() {
   for (; ui; ui = ui->next) {
     // TODO(t.iwanek): this is ignoring icon locale as well as other steps
     // icons should be localized
-    if (ui->icon && ui->icon->name) {
-      bf::path source = GetIconRoot() / ui->icon->name;
+    if (ui->icon && ui->icon->text) {
+      bf::path source = GetIconRoot() / ui->icon->text;
       if (bf::exists(source)) {
         bf::path destination = icons_directory / ui->appid;
         if (destination.has_extension())

diff --git a/src/common/step/step_recover_icons.cc b/src/common/step/step_recover_icons.cc
index 3774b3b..25d70de 100644 (file)
--- a/src/common/step/step_recover_icons.cc
+++ b/src/common/step/step_recover_icons.cc
@@ -60,8 +60,8 @@ bool StepRecoverIcons::TryGatherIcons() {
   for (; ui != nullptr; ui = ui->next) {
     bf::path app_icon = bf::path(getIconPath(context_->uid.get()))
       / bf::path(ui->appid);
-    if (ui->icon && ui->icon->name)
-      app_icon += bf::path(ui->icon->name).extension();
+    if (ui->icon && ui->icon->text)
+      app_icon += bf::path(ui->icon->text).extension();
     else
       app_icon += ".png";
     bf::path icon_backup = GetBackupPathForIconFile(app_icon);

diff --git a/src/common/step/step_remove_icons.cc b/src/common/step/step_remove_icons.cc
index 2e7370c..8f011ca 100644 (file)
--- a/src/common/step/step_remove_icons.cc
+++ b/src/common/step/step_remove_icons.cc
@@ -35,8 +35,8 @@ Step::Status StepRemoveIcons::process() {
   for (; ui != nullptr; ui = ui->next) {
     fs::path app_icon = fs::path(getIconPath(context_->uid.get()))
       / fs::path(ui->appid);
-    if (ui->icon && ui->icon->name)
-      app_icon += fs::path(ui->icon->name).extension();
+    if (ui->icon && ui->icon->text)
+      app_icon += fs::path(ui->icon->text).extension();
     else
       app_icon += ".png";
     if (fs::exists(app_icon)) {

diff --git a/src/wgt/step/step_generate_xml.cc b/src/wgt/step/step_generate_xml.cc
index 2ea8d66..88c702e 100755 (executable)
--- a/src/wgt/step/step_generate_xml.cc
+++ b/src/wgt/step/step_generate_xml.cc
@@ -81,9 +81,9 @@ common_installer::Step::Status StepGenerateXml::GenerateApplicationCommonXml(T*
   }
 
   // icon is renamed to <appid.png>
-  if (app->icon->name) {
+  if (app->icon->text) {
     fs::path app_icon = context_->pkg_path.get() / "res/wgt" /
-        app->icon->name;
+        app->icon->text;
     fs::path icon = app->appid;
     if (app_icon.has_extension())
       icon += app_icon.extension();

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index 55694a1..5eda241 100755 (executable)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -83,7 +83,7 @@ bool StepParse::FillIconPaths(manifest_x* manifest) {
   if (icons_info.get()) {
     for (auto& application_icon : icons_info->icons()) {
       icon_x* icon = reinterpret_cast<icon_x*> (calloc(1, sizeof(icon_x)));
-      icon->name = strdup(application_icon.path().c_str());
+      icon->text = strdup(application_icon.path().c_str());
       LISTADD(manifest->icon, icon);
     }
   }
@@ -162,7 +162,7 @@ bool StepParse::FillApplicationInfo(manifest_x* manifest) {
   if (manifest->icon) {
     icon_x* icon = nullptr;
     LISTHEAD(manifest->icon, icon);
-    manifest->uiapplication->icon->name = strdup(icon->name);
+    manifest->uiapplication->icon->text = strdup(icon->text);
   }
   manifest->uiapplication->next = nullptr;
 
@@ -371,7 +371,7 @@ common_installer::Step::Status StepParse::process() {
   LOG(DEBUG) << "  name        = " <<  name;
   LOG(DEBUG) << "  short_name  = " <<  short_name;
   LOG(DEBUG) << "  aplication version     = " <<  package_version;
-  LOG(DEBUG) << "  icon        = " <<  manifest->uiapplication->icon->name;
+  LOG(DEBUG) << "  icon        = " <<  manifest->uiapplication->icon->text;
   LOG(DEBUG) << "  api_version = " <<  info->required_version();
   LOG(DEBUG) << "  privileges -[";
   for (const auto& p : permissions) {