Merge remote-tracking branch 'rsa/tizen_2.2' into tizen

Conflicts:
	src/jobs/widget_install/task_manifest_file.cpp

Change-Id: Ib3bf102458e896d99bf9b8238de29ece101b29c8

diff --cc packaging/wrt-installer.spec
index 2f10c13,b3ebc4e..e462536
--- 1/packaging/wrt-installer.spec
--- 2/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@@ -1,14 -1,12 +1,14 @@@
 -#git:framework/web/wrt-installer
 +%bcond_with livebox
 +%bcond_with decrypt
  Name:       wrt-installer
  Summary:    Installer for tizen Webruntime
- Version:    0.1.128
+ Version:    0.1.137
  Release:    1
  Group:      Development/Libraries
 -License:    Apache License, Version 2.0
 -URL:        N/A
 +License:    Apache-2.0
  Source0:    %{name}-%{version}.tar.gz
 +Source100:  wrt-preinstall-widgets.service
 +Source1001:   wrt-installer.manifest
  BuildRequires:  cmake
  BuildRequires:  edje-tools
  BuildRequires:  pkgconfig(appsvc)

diff --cc src/CMakeLists.txt
Simple merge

diff --cc src/configuration_parser/widget_parser.cpp
Simple merge

diff --cc src/jobs/widget_install/manifest.cpp
Simple merge

diff --cc src/jobs/widget_install/manifest.h
Simple merge

diff --cc src/jobs/widget_install/task_encrypt_resource.cpp
Simple merge

diff --cc src/jobs/widget_install/task_manifest_file.cpp
index 13d2780,47898ff..c874150
mode 100644,100755..100755
--- 1/src/jobs/widget_install/task_manifest_file.cpp
--- 2/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@@ -117,18 -115,15 +117,19 @@@ TaskManifestFile::TaskManifestFile(Inst
          // for widget update.
          AddStep(&TaskManifestFile::stepBackupIconFiles);
          AddStep(&TaskManifestFile::stepCopyIconFiles);
 +#ifdef LIVEBOX
          AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
 +#endif
+         AddStep(&TaskManifestFile::stepCopyAccountIconFiles);
          AddStep(&TaskManifestFile::stepCreateExecFile);
          AddStep(&TaskManifestFile::stepGenerateManifest);
- 
          AddAbortStep(&TaskManifestFile::stepAbortIconFiles);
      } else {
          AddStep(&TaskManifestFile::stepCopyIconFiles);
 +#ifdef LIVEBOX
          AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
 +#endif
+         AddStep(&TaskManifestFile::stepCopyAccountIconFiles);
          AddStep(&TaskManifestFile::stepCreateExecFile);
          AddStep(&TaskManifestFile::stepGenerateManifest);
      }
@@@ -363,10 -358,31 +365,32 @@@ void TaskManifestFile::stepCopyLiveboxF
          InstallerContext::INSTALL_COPY_LIVEBOX_FILES,
          "Livebox files copy Finished");
  }
 +#endif // LIVEBOX
  
- void TaskManifestFile::copyDynamicBoxFile(const std::string& sourceFile,
-                                           const std::string& targetFile)
+ void TaskManifestFile::stepCopyAccountIconFiles()
+ {
+     _D("Copy Account icon files");
+     WrtDB::ConfigParserData::AccountProvider account =
+         m_context.widgetConfig.configInfo.accountProvider;
+ 
+     if (account.m_iconSet.empty()) {
+         _D("Widget doesn't contain Account");
+         return;
+     }
+ 
+     FOREACH(it, account.m_iconSet) {
+         std::string sourceFile = m_context.locations->getSourceDir() +
+                                  '/' +
+                                  DPL::ToUTF8String(it->second);
+         std::string targetFile = m_context.locations->getSharedResourceDir() +
+                                  '/' +
+                                  DPL::ToUTF8String(it->second);
+         copyFile(sourceFile, targetFile);
+     }
+ }
+ 
+ void TaskManifestFile::copyFile(const std::string& sourceFile,
+                                 const std::string& targetFile)
  {
      Try
      {
@@@ -676,9 -692,8 +700,10 @@@ void TaskManifestFile::writeManifest(co
      setWidgetOtherInfo(uiApp);
      setAppCategory(uiApp);
      setMetadata(uiApp);
-     setLiveBoxInfo(manifest);
 +#ifdef LIVEBOX
+     // move to the last of this procedure
+     //setLiveBoxInfo(manifest);
 +#endif
      setAccount(manifest);
      setPrivilege(manifest);
      manifest.addUiApplication(uiApp);
@@@ -706,6 -721,10 +731,12 @@@
          setMetadata(uiApp);
          manifest.addUiApplication(uiApp);
      }
++#ifdef LIVEBOX
+     // TODO: Must fix again with right method
+     // The mainapp attiribute must be set
+     // when there are multiple uiapps in mainfest
+     setLiveBoxInfo(manifest);
++#endif
  #else
      //default widget content
      setWidgetExecPath(uiApp);
@@@ -718,14 -737,17 +749,21 @@@
      setAppControlsInfo(uiApp);
      setAppCategory(uiApp);
      setMetadata(uiApp);
-     setLiveBoxInfo(manifest);
 +#ifdef LIVEBOX
+     // move to the last of this procedure
+     //setLiveBoxInfo(manifest);
 +#endif
      setAccount(manifest);
      setPrivilege(manifest);
  
      manifest.addUiApplication(uiApp);
++#ifdef LIVEBOX
+     // TODO: Must fix again with right method
+     // The mainapp attiribute must be set
+     // when there are multiple uiapps in mainfest
+     setLiveBoxInfo(manifest);
+ #endif
 +#endif
  
      manifest.generate(path);
      _D("Manifest file serialized");