The order of ui-application element in manifest.xml is changed

[Issue#] P131004-00766
[Problem] The dbox execution file is selected to the main UI application by package manager
[Cause] The order of ui-application element is wrong.
        The dbox execution file is first. And the main web application execution is second.
        The first is set to main ui-application by package manager.
[Solution] The order of ui-application element in manifest.xml is changed.
           But this is the temporary solution.
           The final solution is that the 'mainapp=true' is set in to the main ui-application element.
           Therefore, this commit must be updated with the final solution.

Change-Id: I34445ce0571453cc9c554efb2cabc8d245117cdf

diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
old mode 100644 (file)
new mode 100755 (executable)
index dc5f844..b53fcd6
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -669,7 +669,8 @@ void TaskManifestFile::writeManifest(const DPL::String & path)
     setWidgetOtherInfo(uiApp);
     setAppCategory(uiApp);
     setMetadata(uiApp);
-    setLiveBoxInfo(manifest);
+    // move to the last of this procedure
+    //setLiveBoxInfo(manifest);
     setAccount(manifest);
     setPrivilege(manifest);
     manifest.addUiApplication(uiApp);
@@ -697,6 +698,10 @@ void TaskManifestFile::writeManifest(const DPL::String & path)
         setMetadata(uiApp);
         manifest.addUiApplication(uiApp);
     }
+    // TODO: Must fix again with right method
+    // The mainapp attiribute must be set
+    // when there are multiple uiapps in mainfest
+    setLiveBoxInfo(manifest);
 #else
     //default widget content
     setWidgetExecPath(uiApp);
@@ -709,11 +714,16 @@ void TaskManifestFile::writeManifest(const DPL::String & path)
     setAppControlsInfo(uiApp);
     setAppCategory(uiApp);
     setMetadata(uiApp);
-    setLiveBoxInfo(manifest);
+    // move to the last of this procedure
+    //setLiveBoxInfo(manifest);
     setAccount(manifest);
     setPrivilege(manifest);
 
     manifest.addUiApplication(uiApp);
+    // TODO: Must fix again with right method
+    // The mainapp attiribute must be set
+    // when there are multiple uiapps in mainfest
+    setLiveBoxInfo(manifest);
 #endif
 
     manifest.generate(path);