From 078b746e680401b65c86026920a22bd2e1e69765 Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Wed, 12 Aug 2015 15:56:10 +0200 Subject: [PATCH] Tpk icons location - shared/res/ Quickfix for icon location of tpk packages. Icons are not found otherwise. Change-Id: I73c12bbbccccf55e4d1193fc6ba761948773448b --- src/tpk/step/step_parse.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tpk/step/step_parse.cc b/src/tpk/step/step_parse.cc index dfd8ddd..952120b 100644 --- a/src/tpk/step/step_parse.cc +++ b/src/tpk/step/step_parse.cc @@ -341,12 +341,14 @@ bool StepParse::SetPkgInfoChildren(manifest_x* m, // icon SetChildren(&(p->icon), tree, el, "icon", [&](XmlElement *el, icon_x* p){ - p->text = string_strdup(el->content()); + // TODO(t.iwanek): icons are located in shared/res/ so preppending it. + // it should not be set in manifest_x probably but added elsewhere. + p->text = string_strdup(std::string("shared/res/") + el->content()); // NOTE: name is an attribute, but the xml writer uses it as text. // This must be fixed in whole app-installer modules, including wgt. // Current implementation is just for compatibility. // p->name = string_strdup(el->attr("name")); - p->name = string_strdup(el->content()); + p->name = string_strdup(std::string("shared/res/") + el->content()); }); // label -- 2.7.4