Implementation for new livebox tags

Change-Id: I181b3c5320dafc66b8279ba53155149c7cee02bd
Signed-off-by: Dongeup Ham <dongeup.ham@samsung.com>

diff --git a/inc/InstallerDefs.h b/inc/InstallerDefs.h
index c845d92..de8a0b6 100755 (executable)
--- a/inc/InstallerDefs.h
+++ b/inc/InstallerDefs.h
@@ -23,7 +23,7 @@
 
 #include "InstallerUtil.h"
 
-#define OSP_INSTALLER_VERSION "version=[20130227.1]"
+#define OSP_INSTALLER_VERSION "version=[20130227.2]"
 
 #define DIR_BIN                                L"/bin"
 #define DIR_INFO                       L"/info"

diff --git a/src/Context/InstallationContextData.h b/src/Context/InstallationContextData.h
index 5dba61e..5683a7c 100755 (executable)
--- a/src/Context/InstallationContextData.h
+++ b/src/Context/InstallationContextData.h
@@ -52,7 +52,7 @@ public:
        result AddSize(Tizen::Base::String* pSize, Tizen::Base::String* pPreviewImage);
        Tizen::Base::Collection::HashMap* GetSizeList(void) const;
 
-       Tizen::Base::String __main;
+       Tizen::Base::String __default;
        Tizen::Base::String __configurationAppControlAppId;
 
 private:

diff --git a/src/XmlHandler/ManifestGenerator.cpp b/src/XmlHandler/ManifestGenerator.cpp
index dbeb6e4..236badd 100755 (executable)
--- a/src/XmlHandler/ManifestGenerator.cpp
+++ b/src/XmlHandler/ManifestGenerator.cpp
@@ -224,7 +224,7 @@ ManifestGenerator::WriteLiveboxes(AppData* pAppData) const
                IMap* pLiveboxNameList = pLiveboxData->GetNameList();
                IMap* pSizeList = pLiveboxData->GetSizeList();
                String popupEnabled = pLiveboxData->GetPopupEnabled();
-               String primary = pLiveboxData->__main;
+               String primary = pLiveboxData->__default;
 
                __pWriter->StartElement("livebox");
 

diff --git a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
index 959457c..d18ecff 100755 (executable)
--- a/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
+++ b/src/XmlHandler/Parser/ManifestLiveboxesParser.cpp
@@ -168,11 +168,16 @@ ManifestLiveboxesParser::OnLiveboxStartElement(void)
                AppLog("   - LiveboxPopupEnabled=%s", pLiveboxPopupEnabled);
        }
 
-       char *pMain = pAttr->Find("Main");
-       if (pMain)
+       char* pDefault = pAttr->Find("Default");
+       if (pDefault == null)
        {
-               __pLiveboxData->__main = pMain;
-               AppLog("   - Main=%s", pMain);
+               pDefault = pAttr->Find("Main");
+       }
+
+       if (pDefault)
+       {
+               __pLiveboxData->__default = pDefault;
+               AppLog("   - Default=%s", pDefault);
        }
 
        return true;