Fixed installer couldn't add account to manifest file

[platform/framework/web/wrt-installer.git] / src / jobs / widget_install / manifest.cpp

diff --git a/src/jobs/widget_install/manifest.cpp b/src/jobs/widget_install/manifest.cpp
index 6a62c0c..977f58e 100644 (file)
--- a/src/jobs/widget_install/manifest.cpp
+++ b/src/jobs/widget_install/manifest.cpp
@@ -155,9 +155,10 @@ void Manifest::serialize(xmlTextWriterPtr writer)
         writeAttribute(writer, "type", this->type);
         writeAttribute(writer, "version", this->version);
         if (!this->installLocation.IsNull()) {
-            writeAttribute(writer, "install-location", (*this->installLocation),
-                           (*this->installLocation).empty());
+            writeAttribute(writer, "install-location", (*this->installLocation));
         }
+        writeAttribute(writer, "storeclient-id", this->storeClientId,
+                !this->storeClientId.empty());
 
         FOREACH(l, this->label)
         {
@@ -407,14 +408,20 @@ void LiveBox::serialize(xmlTextWriterPtr writer)
         writeAttribute(writer, "mouse_event", this->box.boxMouseEvent);
         writeAttribute(writer, "touch_effect", this->box.boxTouchEffect);
 
-        FOREACH(m, this->box.boxSize)
+        FOREACH(it, this->box.boxSize)
         {
-            std::pair<DPL::String, DPL::String> boxSize = *m;
             startElement(writer, "size");
-            if (!boxSize.second.empty()) {
-                writeAttribute(writer, "preview", boxSize.second);
+            if (!(*it).m_preview.empty()) {
+                writeAttribute(writer, "preview", (*it).m_preview);
             }
-            writeText(writer, boxSize.first);
+            if (!(*it).m_useDecoration.empty()) {
+                writeAttribute(writer, "need_frame", (*it).m_useDecoration);
+            } else {
+                // default value of use-decoration is "true"
+                writeAttribute(writer, "need_frame", DPL::String(L"true"));
+            }
+
+            writeText(writer, (*it).m_size);
             endElement(writer);
         }
 
@@ -453,7 +460,7 @@ void Account::serialize(xmlTextWriterPtr writer)
     startElement(writer, "account");
     {
         startElement(writer, "account-provider");
-        writeAttribute(writer, "app-id", this->provider.appid);
+        writeAttribute(writer, "appid", this->provider.appid);
         writeAttribute(writer, "multiple-accounts-support",
                 this->provider.multiAccount);